diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index d8338cc4..40f789a3 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -1,11 +1,11 @@
 repos: # pre-commit autoupdate
   - repo: https://github.com/pycqa/flake8
-    rev: "7.1.1"
+    rev: "7.2.0"
     hooks:
       - id: flake8
 
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v4.6.0
+    rev: v5.0.0
     hooks:
       - id: trailing-whitespace
       - id: check-added-large-files
@@ -29,12 +29,12 @@ repos: # pre-commit autoupdate
           [--in-place, --remove-all-unused-imports, --remove-unused-variables]
 
   - repo: https://github.com/pycqa/isort
-    rev: 5.13.2
+    rev: 6.0.1
     hooks:
       - id: isort
 
   - repo: https://github.com/psf/black
-    rev: 24.8.0
+    rev: 25.1.0
     hooks:
       - id: black
         language_version: python3
diff --git a/docker-images/7.0/nvidia2404/Dockerfile b/docker-images/7.0/nvidia2404/Dockerfile
index dd63f570..6414f108 100644
--- a/docker-images/7.0/nvidia2404/Dockerfile
+++ b/docker-images/7.0/nvidia2404/Dockerfile
@@ -18,7 +18,7 @@ COPY download_tarballs.sh /tmp/workdir
 COPY build_source.sh /tmp/workdir
 COPY install_ffmpeg.sh /tmp/workdir
 
-ENV         ENV FFMPEG_VERSION=7.0.2
+ENV FFMPEG_VERSION=7.0.2
 
 ENV NVIDIA_HEADERS_VERSION=11.1.5.3
 
diff --git a/docker-images/7.1/nvidia2404/Dockerfile b/docker-images/7.1/nvidia2404/Dockerfile
index 78726574..45807963 100644
--- a/docker-images/7.1/nvidia2404/Dockerfile
+++ b/docker-images/7.1/nvidia2404/Dockerfile
@@ -18,7 +18,8 @@ COPY download_tarballs.sh /tmp/workdir
 COPY build_source.sh /tmp/workdir
 COPY install_ffmpeg.sh /tmp/workdir
 
-ENV         ENV FFMPEG_VERSION=7.1.1
+
+ENV FFMPEG_VERSION=7.1.1
 
 ENV NVIDIA_HEADERS_VERSION=11.1.5.3
 
diff --git a/templates/Dockerfile-template.nvidia2204 b/templates/Dockerfile-template.nvidia2204
index bdc9811e..85a034a8 100644
--- a/templates/Dockerfile-template.nvidia2204
+++ b/templates/Dockerfile-template.nvidia2204
@@ -32,7 +32,7 @@ FROM  devel-base as build
 
 ENV        NVIDIA_HEADERS_VERSION=11.1.5.3
 
-ENV         %%ENV%%
+%%ENV%%
 
 RUN      buildDeps="autoconf \
                     automake \
diff --git a/templates/Dockerfile-template.nvidia2404 b/templates/Dockerfile-template.nvidia2404
index e84cd280..8ffad353 100644
--- a/templates/Dockerfile-template.nvidia2404
+++ b/templates/Dockerfile-template.nvidia2404
@@ -18,7 +18,7 @@ COPY download_tarballs.sh /tmp/workdir
 COPY build_source.sh /tmp/workdir
 COPY install_ffmpeg.sh /tmp/workdir
 
-ENV         %%ENV%%
+%%ENV%%
 
 # Note: I don't think we need 'ca-certificates'
 ARG DEBIAN_FRONTEND=noninteractive