diff --git a/chronograf/1.10/Dockerfile b/chronograf/1.10/Dockerfile
index c47e62053..3b92c2901 100644
--- a/chronograf/1.10/Dockerfile
+++ b/chronograf/1.10/Dockerfile
@@ -11,7 +11,7 @@ RUN set -ex && \
         gpg --keyserver hkp://keyserver.ubuntu.com --recv-keys "$key" ; \
     done
 
-ENV CHRONOGRAF_VERSION 1.10.7
+ENV CHRONOGRAF_VERSION=1.10.7
 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" && \
     case "${dpkgArch##*-}" in \
       amd64) ARCH='amd64';; \
diff --git a/influxdb/2.7/Dockerfile b/influxdb/2.7/Dockerfile
index 8ed203938..1d41e2265 100644
--- a/influxdb/2.7/Dockerfile
+++ b/influxdb/2.7/Dockerfile
@@ -29,7 +29,7 @@ RUN groupadd -r influxdb --gid=1000 && \
     useradd -r -g influxdb --uid=1000 --create-home --home-dir=/home/influxdb --shell=/bin/bash influxdb
 
 # Install gosu for easy step-down from root
-ENV GOSU_VER 1.16
+ENV GOSU_VER=1.16
 RUN case "$(dpkg --print-architecture)" in \
       *amd64) arch=amd64 ;; \
       *arm64) arch=arm64 ;; \
@@ -49,7 +49,7 @@ RUN case "$(dpkg --print-architecture)" in \
     gosu nobody true
 
 # Install the influxd server
-ENV INFLUXDB_VERSION 2.7.12
+ENV INFLUXDB_VERSION=2.7.12
 RUN case "$(dpkg --print-architecture)" in \
       *amd64) arch=amd64 ;; \
       *arm64) arch=arm64 ;; \
@@ -71,7 +71,7 @@ RUN case "$(dpkg --print-architecture)" in \
     influxd version
 
 # Install the influx CLI
-ENV INFLUX_CLI_VERSION 2.7.5
+ENV INFLUX_CLI_VERSION=2.7.5
 RUN case "$(dpkg --print-architecture)" in \
       *amd64) arch=amd64 ;; \
       *arm64) arch=arm64 ;; \
@@ -106,7 +106,7 @@ CMD ["influxd"]
 
 EXPOSE 8086
 
-ENV INFLUX_CONFIGS_PATH /etc/influxdb2/influx-configs
-ENV INFLUXD_INIT_PORT 9999
-ENV INFLUXD_INIT_PING_ATTEMPTS 600
-ENV DOCKER_INFLUXDB_INIT_CLI_CONFIG_NAME default
+ENV INFLUX_CONFIGS_PATH=/etc/influxdb2/influx-configs
+ENV INFLUXD_INIT_PORT=9999
+ENV INFLUXD_INIT_PING_ATTEMPTS=600
+ENV DOCKER_INFLUXDB_INIT_CLI_CONFIG_NAME=default
diff --git a/influxdb/2.7/alpine/Dockerfile b/influxdb/2.7/alpine/Dockerfile
index 3de759784..f22c14716 100644
--- a/influxdb/2.7/alpine/Dockerfile
+++ b/influxdb/2.7/alpine/Dockerfile
@@ -31,7 +31,7 @@ RUN addgroup -S -g 1000 influxdb && \
     chown -R influxdb:influxdb /home/influxdb
 
 # Install the infuxd server
-ENV INFLUXDB_VERSION 2.7.12
+ENV INFLUXDB_VERSION=2.7.12
 RUN case "$(apk --print-arch)" in \
       x86_64)  arch=amd64 ;; \
       aarch64) arch=arm64 ;; \
@@ -53,7 +53,7 @@ RUN case "$(apk --print-arch)" in \
     influxd version
 
 # Install the influx CLI
-ENV INFLUX_CLI_VERSION 2.7.5
+ENV INFLUX_CLI_VERSION=2.7.5
 RUN case "$(apk --print-arch)" in \
       x86_64)  arch=amd64 ;; \
       aarch64) arch=arm64 ;; \
@@ -88,7 +88,7 @@ CMD ["influxd"]
 
 EXPOSE 8086
 
-ENV INFLUX_CONFIGS_PATH /etc/influxdb2/influx-configs
-ENV INFLUXD_INIT_PORT 9999
-ENV INFLUXD_INIT_PING_ATTEMPTS 600
-ENV DOCKER_INFLUXDB_INIT_CLI_CONFIG_NAME default
+ENV INFLUX_CONFIGS_PATH=/etc/influxdb2/influx-configs
+ENV INFLUXD_INIT_PORT=9999
+ENV INFLUXD_INIT_PING_ATTEMPTS=600
+ENV DOCKER_INFLUXDB_INIT_CLI_CONFIG_NAME=default
diff --git a/kapacitor/1.7/Dockerfile b/kapacitor/1.7/Dockerfile
index c66621905..bb8e66daa 100644
--- a/kapacitor/1.7/Dockerfile
+++ b/kapacitor/1.7/Dockerfile
@@ -5,7 +5,7 @@ RUN DEBIAN_FRONTEND=noninteractive apt-get update && \
     awk 'f{if(sub(/^#/,"",$0)==0){f=0}};/^# enable bash completion/{f=1};{print;}' /etc/bash.bashrc > /etc/bash.bashrc.new && \
     mv /etc/bash.bashrc.new /etc/bash.bashrc
 
-ENV KAPACITOR_VERSION 1.7.7
+ENV KAPACITOR_VERSION=1.7.7
 
 RUN set -eux && \
     ARCH= && dpkgArch="$(dpkg --print-architecture)" && \
diff --git a/kapacitor/1.7/alpine/Dockerfile b/kapacitor/1.7/alpine/Dockerfile
index 78ff005df..3a784ffee 100644
--- a/kapacitor/1.7/alpine/Dockerfile
+++ b/kapacitor/1.7/alpine/Dockerfile
@@ -4,7 +4,7 @@ RUN echo 'hosts: files dns' >> /etc/nsswitch.conf
 RUN apk add --no-cache ca-certificates su-exec && \
     update-ca-certificates
 
-ENV KAPACITOR_VERSION 1.7.7
+ENV KAPACITOR_VERSION=1.7.7
 
 RUN set -ex && \
     mkdir ~/.gnupg; \
diff --git a/telegraf/1.35/Dockerfile b/telegraf/1.35/Dockerfile
index 2aab454e5..2d568c42c 100644
--- a/telegraf/1.35/Dockerfile
+++ b/telegraf/1.35/Dockerfile
@@ -13,7 +13,7 @@ RUN set -ex && \
         gpg --keyserver hkp://keyserver.ubuntu.com --recv-keys "$key" ; \
     done
 
-ENV TELEGRAF_VERSION 1.35.2
+ENV TELEGRAF_VERSION=1.35.2
 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" && \
     case "${dpkgArch##*-}" in \
       amd64) ARCH='amd64';; \
diff --git a/telegraf/1.35/alpine/Dockerfile b/telegraf/1.35/alpine/Dockerfile
index 4c604c600..21c8858cb 100644
--- a/telegraf/1.35/alpine/Dockerfile
+++ b/telegraf/1.35/alpine/Dockerfile
@@ -4,7 +4,7 @@ RUN echo 'hosts: files dns' >> /etc/nsswitch.conf
 RUN apk add --no-cache iputils ca-certificates net-snmp-tools procps lm_sensors tzdata setpriv libcap && \
     update-ca-certificates
 
-ENV TELEGRAF_VERSION 1.35.2
+ENV TELEGRAF_VERSION=1.35.2
 
 RUN ARCH= && \
     case "$(apk --print-arch)" in \
diff --git a/telegraf/nightly/Dockerfile b/telegraf/nightly/Dockerfile
index 30f3ec98f..38f5bd28a 100644
--- a/telegraf/nightly/Dockerfile
+++ b/telegraf/nightly/Dockerfile
@@ -4,7 +4,7 @@ RUN DEBIAN_FRONTEND=noninteractive apt-get update && \
     DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends iputils-ping snmp procps lm-sensors libcap2-bin && \
     rm -rf /var/lib/apt/lists/*
 
-ENV TELEGRAF_VERSION nightly
+ENV TELEGRAF_VERSION=nightly
 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" && \
     case "${dpkgArch##*-}" in \
       amd64) ARCH='amd64';; \
diff --git a/telegraf/nightly/alpine/Dockerfile b/telegraf/nightly/alpine/Dockerfile
index 417236604..42a6d5864 100644
--- a/telegraf/nightly/alpine/Dockerfile
+++ b/telegraf/nightly/alpine/Dockerfile
@@ -4,7 +4,7 @@ RUN echo 'hosts: files dns' >> /etc/nsswitch.conf
 RUN apk add --no-cache iputils ca-certificates net-snmp-tools procps lm_sensors tzdata su-exec libcap && \
     update-ca-certificates
 
-ENV TELEGRAF_VERSION nightly
+ENV TELEGRAF_VERSION=nightly
 
 RUN ARCH= && \
     case "$(apk --print-arch)" in \