diff --git a/arpspoof/Dockerfile b/arpspoof/Dockerfile
index 38a141fbf..d970df9fd 100644
--- a/arpspoof/Dockerfile
+++ b/arpspoof/Dockerfile
@@ -16,7 +16,8 @@
 
 ARG BUILD_FROM
 ARG BUILD_VERSION
-FROM $BUILD_FROM
+ARG BUILD_UPSTREAM="1.0.0"
+FROM ${BUILD_FROM}${BUILD_UPSTREAM}
 
 ##################
 # 2 Modify Image #
diff --git a/arpspoof/build.json b/arpspoof/build.json
index fe38da0a1..21de2a7f2 100644
--- a/arpspoof/build.json
+++ b/arpspoof/build.json
@@ -1,10 +1,10 @@
 {
   "build_from": {
-    "aarch64": "techblog/arpspoof-docker:latest",
-    "amd64": "techblog/arpspoof-docker:latest",
-    "armv7": "techblog/arpspoof-docker:latest"
+    "aarch64": "techblog/arpspoof-docker:",
+    "amd64": "techblog/arpspoof-docker:",
+    "armv7": "techblog/arpspoof-docker:"
   },
   "codenotary": {
     "signer": "alexandrep.github@gmail.com"
   }
-}
+}
\ No newline at end of file
diff --git a/bazarr/Dockerfile b/bazarr/Dockerfile
index 0e1496819..04b30dd00 100644
--- a/bazarr/Dockerfile
+++ b/bazarr/Dockerfile
@@ -16,7 +16,8 @@
 
 ARG BUILD_FROM
 ARG BUILD_VERSION
-FROM ${BUILD_FROM}
+ARG BUILD_UPSTREAM="1.1.2"
+FROM ${BUILD_FROM}${BUILD_UPSTREAM}
 
 ##################
 # 2 Modify Image #
diff --git a/bazarr/build.json b/bazarr/build.json
index e83fc4288..6539319aa 100644
--- a/bazarr/build.json
+++ b/bazarr/build.json
@@ -1,10 +1,10 @@
 {
   "build_from": {
-    "aarch64": "lscr.io/linuxserver/bazarr:arm64v8-latest",
-    "amd64": "lscr.io/linuxserver/bazarr:amd64-latest",
-    "armv7": "lscr.io/linuxserver/bazarr:arm32v7-latest"
+    "aarch64": "lscr.io/linuxserver/bazarr:arm64v8-",
+    "amd64": "lscr.io/linuxserver/bazarr:amd64-",
+    "armv7": "lscr.io/linuxserver/bazarr:arm32v7-"
   },
   "codenotary": {
     "signer": "alexandrep.github@gmail.com"
   }
-}
+}
\ No newline at end of file
diff --git a/booksonic_air/Dockerfile b/booksonic_air/Dockerfile
index e7f2bee48..c57192e04 100644
--- a/booksonic_air/Dockerfile
+++ b/booksonic_air/Dockerfile
@@ -16,7 +16,8 @@
 
 ARG BUILD_FROM
 ARG BUILD_VERSION
-FROM $BUILD_FROM
+ARG BUILD_UPSTREAM="v2201.1.0-ls71"
+FROM ${BUILD_FROM}${BUILD_UPSTREAM}
 
 ##################
 # 2 Modify Image #
diff --git a/booksonic_air/build.json b/booksonic_air/build.json
index 49d591c03..a1032ee13 100644
--- a/booksonic_air/build.json
+++ b/booksonic_air/build.json
@@ -1,10 +1,10 @@
 {
   "build_from": {
-    "aarch64": "lscr.io/linuxserver/booksonic-air:arm64v8-latest",
-    "amd64": "lscr.io/linuxserver/booksonic-air:amd64-latest",
-    "armv7": "lscr.io/linuxserver/booksonic-air:arm32v7-latest"
+    "aarch64": "lscr.io/linuxserver/booksonic-air:arm64v8-",
+    "amd64": "lscr.io/linuxserver/booksonic-air:amd64-",
+    "armv7": "lscr.io/linuxserver/booksonic-air:arm32v7-"
   },
   "codenotary": {
     "signer": "alexandrep.github@gmail.com"
   }
-}
+}
\ No newline at end of file
diff --git a/calibre/Dockerfile b/calibre/Dockerfile
index 8daaa6357..b046b5ff6 100644
--- a/calibre/Dockerfile
+++ b/calibre/Dockerfile
@@ -16,7 +16,8 @@
 
 ARG BUILD_FROM
 ARG BUILD_VERSION
-FROM ${BUILD_FROM}
+ARG BUILD_UPSTREAM="v6.7.1-ls186"
+FROM ${BUILD_FROM}${BUILD_UPSTREAM}
 ENV BASHIO_VERSION=1.29.1
 
 ##################
diff --git a/calibre/build.json b/calibre/build.json
index fefdd6826..e00db86c1 100644
--- a/calibre/build.json
+++ b/calibre/build.json
@@ -1,10 +1,10 @@
 {
   "build_from": {
-    "aarch64": "lscr.io/linuxserver/calibre:arm64v8-latest",
-    "amd64": "lscr.io/linuxserver/calibre:amd64-latest",
-    "armv7": "lscr.io/linuxserver/calibre:arm32v7-arch-version-79d7ec5e"
+    "aarch64": "lscr.io/linuxserver/calibre:arm64v8-",
+    "amd64": "lscr.io/linuxserver/calibre:amd64-",
+    "armv7": "lscr.io/linuxserver/calibre:arm32v7-"
   },
   "codenotary": {
     "signer": "alexandrep.github@gmail.com"
   }
-}
+}
\ No newline at end of file
diff --git a/calibre_web/Dockerfile b/calibre_web/Dockerfile
index 11c7220fc..6159bc0e7 100644
--- a/calibre_web/Dockerfile
+++ b/calibre_web/Dockerfile
@@ -16,7 +16,8 @@
 
 ARG BUILD_FROM
 ARG BUILD_VERSION
-FROM ${BUILD_FROM}
+ARG BUILD_UPSTREAM="0.6.19-ls178"
+FROM ${BUILD_FROM}${BUILD_UPSTREAM}
 ENV BASHIO_VERSION=1.29.1
 
 ##################
diff --git a/calibre_web/build.json b/calibre_web/build.json
index ab6ee1580..551953fd6 100644
--- a/calibre_web/build.json
+++ b/calibre_web/build.json
@@ -1,10 +1,10 @@
 {
   "build_from": {
-    "aarch64": "lscr.io/linuxserver/calibre-web:arm64v8-latest",
-    "amd64": "lscr.io/linuxserver/calibre-web:amd64-latest",
-    "armv7": "lscr.io/linuxserver/calibre-web:arm32v7-latest"
+    "aarch64": "lscr.io/linuxserver/calibre-web:arm64v8-",
+    "amd64": "lscr.io/linuxserver/calibre-web:amd64-",
+    "armv7": "lscr.io/linuxserver/calibre-web:arm32v7-"
   },
   "codenotary": {
     "signer": "alexandrep.github@gmail.com"
   }
-}
+}
\ No newline at end of file
diff --git a/cloudcommander/Dockerfile b/cloudcommander/Dockerfile
index c3ad44248..c2b0b6ff7 100644
--- a/cloudcommander/Dockerfile
+++ b/cloudcommander/Dockerfile
@@ -15,7 +15,8 @@
 #################
 
 ARG BUILD_VERSION
-FROM coderaiser/cloudcmd:latest
+ARG BUILD_UPSTREAM="16.6.0"
+FROM coderaiser/cloudcmd:${BUILD_UPSTREAM}
 
 ##################
 # 2 Modify Image #
diff --git a/code-server/Dockerfile b/code-server/Dockerfile
index 45216dc4c..d0d163d46 100644
--- a/code-server/Dockerfile
+++ b/code-server/Dockerfile
@@ -16,7 +16,8 @@
 
 ARG BUILD_FROM
 ARG BUILD_VERSION
-FROM ${BUILD_FROM}
+ARG BUILD_UPSTREAM="4.7.1"
+FROM ${BUILD_FROM}${BUILD_UPSTREAM}
 
 ##################
 # 2 Modify Image #
diff --git a/code-server/build.json b/code-server/build.json
index 0e85e32cc..90e5fbf81 100644
--- a/code-server/build.json
+++ b/code-server/build.json
@@ -1,10 +1,10 @@
 {
   "build_from": {
-    "aarch64": "lscr.io/linuxserver/code-server:arm64v8-latest",
-    "amd64": "lscr.io/linuxserver/code-server:amd64-latest",
-    "armv7": "lscr.io/linuxserver/code-server:arm32v7-latest"
+    "aarch64": "lscr.io/linuxserver/code-server:arm64v8-",
+    "amd64": "lscr.io/linuxserver/code-server:amd64-",
+    "armv7": "lscr.io/linuxserver/code-server:arm32v7-"
   },
   "codenotary": {
     "signer": "alexandrep.github@gmail.com"
   }
-}
+}
\ No newline at end of file
diff --git a/emby/Dockerfile b/emby/Dockerfile
index c5900ce60..e10af71d8 100644
--- a/emby/Dockerfile
+++ b/emby/Dockerfile
@@ -16,7 +16,8 @@
 
 ARG BUILD_FROM
 ARG BUILD_VERSION
-FROM ${BUILD_FROM}
+ARG BUILD_UPSTREAM="4.8.0.12"
+FROM ${BUILD_FROM}${BUILD_UPSTREAM}
 
 ##################
 # 2 Modify Image #
diff --git a/emby/build.json b/emby/build.json
index fc5cff03b..68cca8769 100644
--- a/emby/build.json
+++ b/emby/build.json
@@ -1,10 +1,10 @@
 {
   "build_from": {
-    "aarch64": "lscr.io/linuxserver/emby:arm64v8-beta",
-    "amd64": "lscr.io/linuxserver/emby:amd64-beta",
-    "armv7": "lscr.io/linuxserver/emby:arm32v7-beta"
+    "aarch64": "lscr.io/linuxserver/emby:arm64v8-beta-version-",
+    "amd64": "lscr.io/linuxserver/emby:amd64-beta-version-",
+    "armv7": "lscr.io/linuxserver/emby:arm32v7-beta-version-"
   },
   "codenotary": {
     "signer": "alexandrep.github@gmail.com"
   }
-}
+}
\ No newline at end of file