diff --git a/oldstable/Dockerfile b/oldstable/Dockerfile
index a823a871..2c468d62 100644
--- a/oldstable/Dockerfile
+++ b/oldstable/Dockerfile
@@ -9,10 +9,10 @@
 
 FROM golang:1.14.9
 
-ENV GOLANGCI_LINT_VERSION v1.31.0
-ENV STATICCHECK_VERSION 2020.1.6
-ENV APT_BSDMAINUTILS_VERSION 11.1.2+b1
-ENV APT_TREE_VERSION 1.8.0-1
+ENV GOLANGCI_LINT_VERSION="v1.31.0"
+ENV STATICCHECK_VERSION="2020.1.6"
+ENV APT_BSDMAINUTILS_VERSION="11.1.2+b1"
+ENV APT_TREE_VERSION="1.8.0-1"
 
 RUN apt-get update \
     && apt-get install -y --no-install-recommends \
diff --git a/stable/Dockerfile.alpine-build.x64 b/stable/Dockerfile.alpine-build.x64
index 1d7c1810..da1d159c 100644
--- a/stable/Dockerfile.alpine-build.x64
+++ b/stable/Dockerfile.alpine-build.x64
@@ -10,16 +10,16 @@
 FROM golang:1.15.2-alpine3.12
 
 # NOTE: This version was different than the base `gcc` pkg when last checked
-ENV APK_GCC_MINGW64_VERSION 9.3.0-r0
+ENV APK_GCC_MINGW64_VERSION="9.3.0-r0"
 
-ENV APK_BASH_VERSION 5.0.17-r0
-ENV APK_GCC_VERSION 9.3.0-r2
-ENV APK_GIT_VERSION 2.26.2-r0
-ENV APK_MAKE_VERSION 4.3-r0
-ENV APK_UTIL_LINUX_VERSION 2.35.2-r0
-ENV APK_FILE_VERSION 5.38-r0
-ENV APK_NANO_VERSION 4.9.3-r0
-ENV APK_MUSL_DEV_VERSION 1.1.24-r9
+ENV APK_BASH_VERSION="5.0.17-r0"
+ENV APK_GCC_VERSION="9.3.0-r2"
+ENV APK_GIT_VERSION="2.26.2-r0"
+ENV APK_MAKE_VERSION="4.3-r0"
+ENV APK_UTIL_LINUX_VERSION="2.35.2-r0"
+ENV APK_FILE_VERSION="5.38-r0"
+ENV APK_NANO_VERSION="4.9.3-r0"
+ENV APK_MUSL_DEV_VERSION="1.1.24-r9"
 
 # Install specific version of packages
 # RUN apk update && \
diff --git a/stable/Dockerfile.alpine-build.x86 b/stable/Dockerfile.alpine-build.x86
index 84e13d78..137e434f 100644
--- a/stable/Dockerfile.alpine-build.x86
+++ b/stable/Dockerfile.alpine-build.x86
@@ -10,16 +10,16 @@
 FROM i386/golang:1.15.2-alpine3.12
 
 # NOTE: This version was different than the base `gcc` pkg when last checked
-ENV APK_GCC_MINGW64_VERSION 9.3.0-r0
+ENV APK_GCC_MINGW64_VERSION="9.3.0-r0"
 
-ENV APK_BASH_VERSION 5.0.17-r0
-ENV APK_GCC_VERSION 9.3.0-r2
-ENV APK_GIT_VERSION 2.26.2-r0
-ENV APK_MAKE_VERSION 4.3-r0
-ENV APK_UTIL_LINUX_VERSION 2.35.2-r0
-ENV APK_FILE_VERSION 5.38-r0
-ENV APK_NANO_VERSION 4.9.3-r0
-ENV APK_MUSL_DEV_VERSION 1.1.24-r9
+ENV APK_BASH_VERSION="5.0.17-r0"
+ENV APK_GCC_VERSION="9.3.0-r2"
+ENV APK_GIT_VERSION="2.26.2-r0"
+ENV APK_MAKE_VERSION="4.3-r0"
+ENV APK_UTIL_LINUX_VERSION="2.35.2-r0"
+ENV APK_FILE_VERSION="5.38-r0"
+ENV APK_NANO_VERSION="4.9.3-r0"
+ENV APK_MUSL_DEV_VERSION="1.1.24-r9"
 
 # Install specific version of packages
 # RUN apk update && \
diff --git a/stable/Dockerfile.combined b/stable/Dockerfile.combined
index e29dfce1..5672cc2d 100644
--- a/stable/Dockerfile.combined
+++ b/stable/Dockerfile.combined
@@ -9,10 +9,10 @@
 
 FROM golang:1.15.2
 
-ENV GOLANGCI_LINT_VERSION v1.31.0
-ENV STATICCHECK_VERSION 2020.1.6
-ENV APT_BSDMAINUTILS_VERSION 11.1.2+b1
-ENV APT_TREE_VERSION 1.8.0-1
+ENV GOLANGCI_LINT_VERSION="v1.31.0"
+ENV STATICCHECK_VERSION="2020.1.6"
+ENV APT_BSDMAINUTILS_VERSION="11.1.2+b1"
+ENV APT_TREE_VERSION="1.8.0-1"
 
 RUN apt-get update \
     && apt-get install -y --no-install-recommends \
diff --git a/stable/Dockerfile.debian-build b/stable/Dockerfile.debian-build
index 1ae82320..cb9d578f 100644
--- a/stable/Dockerfile.debian-build
+++ b/stable/Dockerfile.debian-build
@@ -9,12 +9,12 @@
 
 FROM golang:1.15.2
 
-ENV GOLANGCI_LINT_VERSION v1.31.0
-ENV STATICCHECK_VERSION 2020.1.6
-ENV APT_BSDMAINUTILS_VERSION 11.1.2+b1
-ENV APT_TREE_VERSION 1.8.0-1
-ENV APT_GCC_MULTILIB_VERSION 4:8.3.0-1
-ENV APT_GCC_MINGW_W64_VERSION 8.3.0-6+21.3~deb10u1
+ENV GOLANGCI_LINT_VERSION="v1.31.0"
+ENV STATICCHECK_VERSION="2020.1.6"
+ENV APT_BSDMAINUTILS_VERSION="11.1.2+b1"
+ENV APT_TREE_VERSION="1.8.0-1"
+ENV APT_GCC_MULTILIB_VERSION="4:8.3.0-1"
+ENV APT_GCC_MINGW_W64_VERSION="8.3.0-6+21.3~deb10u1"
 
 RUN apt-get update \
     && apt-get install -y --no-install-recommends \
diff --git a/stable/Dockerfile.linting b/stable/Dockerfile.linting
index 83710070..1b37638c 100644
--- a/stable/Dockerfile.linting
+++ b/stable/Dockerfile.linting
@@ -13,7 +13,7 @@
 # use the same environment as our final image for binary compatibility
 FROM golangci/golangci-lint:v1.31.0-alpine as builder
 
-ENV STATICCHECK_VERSION 2020.1.6
+ENV STATICCHECK_VERSION="2020.1.6"
 
 # Skip go clean step as the entire image will be tossed after we are finished
 # and cleaning the modules cache takes extra time that won't help the final
@@ -25,8 +25,8 @@ RUN GO111MODULE="on" go get honnef.co/go/tools/cmd/staticcheck@${STATICCHECK_VER
 FROM golangci/golangci-lint:v1.31.0-alpine
 
 # Intended to help identify the versions of the included linting tools
-ENV GOLANGCI_LINT_VERSION v1.31.0
-ENV STATICCHECK_VERSION 2020.1.6
+ENV GOLANGCI_LINT_VERSION="v1.31.0"
+ENV STATICCHECK_VERSION="2020.1.6"
 
 COPY --from=builder /go/bin/staticcheck /usr/bin/staticcheck
 
diff --git a/unstable/Dockerfile b/unstable/Dockerfile
index 4f97a8d7..06731d34 100644
--- a/unstable/Dockerfile
+++ b/unstable/Dockerfile
@@ -9,10 +9,10 @@
 
 FROM golang:1.15.2
 
-ENV GOLANGCI_LINT_VERSION v1.31.0
-ENV STATICCHECK_VERSION 2020.1.6
-ENV APT_BSDMAINUTILS_VERSION 11.1.2+b1
-ENV APT_TREE_VERSION 1.8.0-1
+ENV GOLANGCI_LINT_VERSION="v1.31.0"
+ENV STATICCHECK_VERSION="2020.1.6"
+ENV APT_BSDMAINUTILS_VERSION="11.1.2+b1"
+ENV APT_TREE_VERSION="1.8.0-1"
 
 RUN apt-get update \
     && apt-get install -y --no-install-recommends \