diff --git a/Dockerfile.10 b/Dockerfile.10
index 62ef148..9bf7ec5 100644
--- a/Dockerfile.10
+++ b/Dockerfile.10
@@ -20,10 +20,10 @@ ARG NODE_MANAGER="fnm"
 
 ARG IMAGE_REPO="casjaysdevdocker/nodejs"
 ARG IMAGE_VERSION="${NODE_VERSION}"
-ARG CONTAINER_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 ed4bea9..022c38e 100644
--- a/Dockerfile.12
+++ b/Dockerfile.12
@@ -20,10 +20,10 @@ ARG NODE_MANAGER="fnm"
 
 ARG IMAGE_REPO="casjaysdevdocker/nodejs"
 ARG IMAGE_VERSION="${NODE_VERSION}"
-ARG CONTAINER_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 993e035..6fef85f 100644
--- a/Dockerfile.14
+++ b/Dockerfile.14
@@ -20,10 +20,10 @@ ARG NODE_MANAGER="fnm"
 
 ARG IMAGE_REPO="casjaysdevdocker/nodejs"
 ARG IMAGE_VERSION="${NODE_VERSION}"
-ARG CONTAINER_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 10f057d..1b5d045 100644
--- a/Dockerfile.16
+++ b/Dockerfile.16
@@ -20,10 +20,10 @@ ARG NODE_MANAGER="fnm"
 
 ARG IMAGE_REPO="casjaysdevdocker/nodejs"
 ARG IMAGE_VERSION="${NODE_VERSION}"
-ARG CONTAINER_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 ed9a4e3..92846e2 100644
--- a/Dockerfile.18
+++ b/Dockerfile.18
@@ -20,10 +20,10 @@ ARG NODE_MANAGER="fnm"
 
 ARG IMAGE_REPO="casjaysdevdocker/nodejs"
 ARG IMAGE_VERSION="${NODE_VERSION}"
-ARG CONTAINER_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 3ba8933..b8d3645 100644
--- a/Dockerfile.20
+++ b/Dockerfile.20
@@ -20,10 +20,10 @@ ARG NODE_MANAGER="fnm"
 
 ARG IMAGE_REPO="casjaysdevdocker/nodejs"
 ARG IMAGE_VERSION="${NODE_VERSION}"
-ARG CONTAINER_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