diff --git a/Dockerfile.10 b/Dockerfile.10
index c561d3d..4432260 100644
--- a/Dockerfile.10
+++ b/Dockerfile.10
@@ -19,11 +19,11 @@ ARG NODE_VERSION="10"
 ARG NODE_MANAGER="fnm"
 
 ARG IMAGE_REPO="casjaysdevdocker/nodejs"
-ARG IMAGE_VERSION="latest"
+ARG IMAGE_VERSION="${NODE_VERSION}"
 ARG CONTAINER_VERSION=""
 
 ARG PULL_URL="casjaysdev/debian"
-ARG DISTRO_VERSION="$IMAGE_VERSION"
+ARG DISTRO_VERSION="latest"
 ARG BUILD_VERSION="${BUILD_DATE}"
 
 FROM tianon/gosu:latest AS gosu
diff --git a/Dockerfile.12 b/Dockerfile.12
index 1a4d052..8b668dd 100644
--- a/Dockerfile.12
+++ b/Dockerfile.12
@@ -19,11 +19,11 @@ ARG NODE_VERSION="12"
 ARG NODE_MANAGER="fnm"
 
 ARG IMAGE_REPO="casjaysdevdocker/nodejs"
-ARG IMAGE_VERSION="latest"
+ARG IMAGE_VERSION="${NODE_VERSION}"
 ARG CONTAINER_VERSION=""
 
 ARG PULL_URL="casjaysdev/debian"
-ARG DISTRO_VERSION="$IMAGE_VERSION"
+ARG DISTRO_VERSION="latest"
 ARG BUILD_VERSION="${BUILD_DATE}"
 
 FROM tianon/gosu:latest AS gosu
diff --git a/Dockerfile.14 b/Dockerfile.14
index 8fabf0b..a7c487f 100644
--- a/Dockerfile.14
+++ b/Dockerfile.14
@@ -19,11 +19,11 @@ ARG NODE_VERSION="14"
 ARG NODE_MANAGER="fnm"
 
 ARG IMAGE_REPO="casjaysdevdocker/nodejs"
-ARG IMAGE_VERSION="latest"
+ARG IMAGE_VERSION="${NODE_VERSION}"
 ARG CONTAINER_VERSION=""
 
 ARG PULL_URL="casjaysdev/debian"
-ARG DISTRO_VERSION="$IMAGE_VERSION"
+ARG DISTRO_VERSION="latest"
 ARG BUILD_VERSION="${BUILD_DATE}"
 
 FROM tianon/gosu:latest AS gosu
diff --git a/Dockerfile.16 b/Dockerfile.16
index eda6f3d..d4a179f 100644
--- a/Dockerfile.16
+++ b/Dockerfile.16
@@ -19,11 +19,11 @@ ARG NODE_VERSION="16"
 ARG NODE_MANAGER="fnm"
 
 ARG IMAGE_REPO="casjaysdevdocker/nodejs"
-ARG IMAGE_VERSION="latest"
+ARG IMAGE_VERSION="${NODE_VERSION}"
 ARG CONTAINER_VERSION=""
 
 ARG PULL_URL="casjaysdev/debian"
-ARG DISTRO_VERSION="$IMAGE_VERSION"
+ARG DISTRO_VERSION="latest"
 ARG BUILD_VERSION="${BUILD_DATE}"
 
 FROM tianon/gosu:latest AS gosu
diff --git a/Dockerfile.18 b/Dockerfile.18
index 88f6442..f36cb7f 100644
--- a/Dockerfile.18
+++ b/Dockerfile.18
@@ -19,11 +19,11 @@ ARG NODE_VERSION="18"
 ARG NODE_MANAGER="fnm"
 
 ARG IMAGE_REPO="casjaysdevdocker/nodejs"
-ARG IMAGE_VERSION="latest"
+ARG IMAGE_VERSION="${NODE_VERSION}"
 ARG CONTAINER_VERSION=""
 
 ARG PULL_URL="casjaysdev/debian"
-ARG DISTRO_VERSION="$IMAGE_VERSION"
+ARG DISTRO_VERSION="latest"
 ARG BUILD_VERSION="${BUILD_DATE}"
 
 FROM tianon/gosu:latest AS gosu
diff --git a/Dockerfile.20 b/Dockerfile.20
index f3d3866..1fb76e7 100644
--- a/Dockerfile.20
+++ b/Dockerfile.20
@@ -19,11 +19,11 @@ ARG NODE_VERSION="20"
 ARG NODE_MANAGER="fnm"
 
 ARG IMAGE_REPO="casjaysdevdocker/nodejs"
-ARG IMAGE_VERSION="latest"
+ARG IMAGE_VERSION="${NODE_VERSION}"
 ARG CONTAINER_VERSION=""
 
 ARG PULL_URL="casjaysdev/debian"
-ARG DISTRO_VERSION="$IMAGE_VERSION"
+ARG DISTRO_VERSION="latest"
 ARG BUILD_VERSION="${BUILD_DATE}"
 
 FROM tianon/gosu:latest AS gosu