diff --git a/code-server/Dockerfile b/code-server/Dockerfile
index 69082a60d..b5259c4c1 100644
--- a/code-server/Dockerfile
+++ b/code-server/Dockerfile
@@ -1,16 +1,18 @@
 ARG BUILD_FROM
-FROM $BUILD_FROM
+ARG BUILD_VERSION
+
+FROM ${BUILD_FROM}-${BUILD_VERSION}
 
 # Install bashio
 RUN apt-get update \
     && apt-get install -y --no-install-recommends \
-        jq \
+    jq \
     && curl -J -L -o /tmp/bashio.tar.gz \
-        "https://github.com/hassio-addons/bashio/archive/v0.7.1.tar.gz" \
+    "https://github.com/hassio-addons/bashio/archive/v0.7.1.tar.gz" \
     && mkdir /tmp/bashio \
     && tar zxvf \
-        /tmp/bashio.tar.gz \
-        --strip 1 -C /tmp/bashio \
+    /tmp/bashio.tar.gz \
+    --strip 1 -C /tmp/bashio \
     \
     && mv /tmp/bashio/lib /usr/lib/bashio \
     && ln -s /usr/lib/bashio/bashio /usr/bin/bashio
diff --git a/code-server/build.json b/code-server/build.json
index 2d9b51f46..f1bffecf0 100644
--- a/code-server/build.json
+++ b/code-server/build.json
@@ -1,9 +1,9 @@
 {
     "build_from": {
-        "armv7": "linuxserver/code-server:arm32v7-v3.8.0-ls64",
-        "armhf": "linuxserver/code-server:arm32v7-v3.8.0-ls64",
-        "aarch64": "linuxserver/code-server:arm64v8-v3.8.0-ls64",
-        "amd64": "linuxserver/code-server:amd64-v3.8.0-ls64"
+        "armv7": "linuxserver/code-server:arm32v7",
+        "armhf": "linuxserver/code-server:arm32v7",
+        "aarch64": "linuxserver/code-server:arm64v8",
+        "amd64": "linuxserver/code-server:amd64"
     },
     "squash": false,
     "args": {}
diff --git a/doublecommander/Dockerfile b/doublecommander/Dockerfile
index e60e6a4df..1ab0c04d6 100644
--- a/doublecommander/Dockerfile
+++ b/doublecommander/Dockerfile
@@ -1,16 +1,18 @@
 ARG BUILD_FROM
-FROM $BUILD_FROM
+ARG BUILD_VERSION
+
+FROM ${BUILD_FROM}-${BUILD_VERSION}
 
 # Install bashio
 RUN apt-get update \
     && apt-get install -y --no-install-recommends \
-        jq \
+    jq \
     && curl -J -L -o /tmp/bashio.tar.gz \
-        "https://github.com/hassio-addons/bashio/archive/v0.7.1.tar.gz" \
+    "https://github.com/hassio-addons/bashio/archive/v0.7.1.tar.gz" \
     && mkdir /tmp/bashio \
     && tar zxvf \
-        /tmp/bashio.tar.gz \
-        --strip 1 -C /tmp/bashio \
+    /tmp/bashio.tar.gz \
+    --strip 1 -C /tmp/bashio \
     \
     && mv /tmp/bashio/lib /usr/lib/bashio \
     && ln -s /usr/lib/bashio/bashio /usr/bin/bashio
diff --git a/doublecommander/build.json b/doublecommander/build.json
index 9de1687b5..6fbe33882 100644
--- a/doublecommander/build.json
+++ b/doublecommander/build.json
@@ -1,9 +1,9 @@
 {
     "build_from": {
-        "armv7": "linuxserver/doublecommander:arm32v7-0.8.2-1-ls38",
-        "armhf": "linuxserver/doublecommander:arm32v7-0.8.2-1-ls38",
-        "aarch64": "linuxserver/doublecommander:arm64v8-0.8.2-1-ls38",
-        "amd64": "linuxserver/doublecommander:amd64-0.8.2-1-ls38"
+        "armv7": "linuxserver/doublecommander:arm32v7",
+        "armhf": "linuxserver/doublecommander:arm32v7",
+        "aarch64": "linuxserver/doublecommander:arm64v8",
+        "amd64": "linuxserver/doublecommander:amd64"
     },
     "squash": false,
     "args": {}
diff --git a/emby/Dockerfile b/emby/Dockerfile
index cbcfab0c2..4e3362efe 100644
--- a/emby/Dockerfile
+++ b/emby/Dockerfile
@@ -1,6 +1,7 @@
 ARG BUILD_FROM
-# hadolint ignore=DL3006
-FROM $BUILD_FROM
+ARG BUILD_VERSION
+
+FROM ${BUILD_FROM}-${BUILD_VERSION}
 
 # Set shell
 SHELL ["/bin/bash", "-o", "pipefail", "-c"]
@@ -8,22 +9,22 @@ SHELL ["/bin/bash", "-o", "pipefail", "-c"]
 RUN apt-get update \
     \
     && apt-get install -y --no-install-recommends \
-        jq \
+    jq \
     \
     && apt-get -y upgrade cifs-utils \
     && curl -J -L -o /tmp/bashio.tar.gz \
-        "https://github.com/hassio-addons/bashio/archive/v0.7.1.tar.gz" \
+    "https://github.com/hassio-addons/bashio/archive/v0.7.1.tar.gz" \
     && mkdir /tmp/bashio \
     && tar zxvf \
-        /tmp/bashio.tar.gz \
-        --strip 1 -C /tmp/bashio \
+    /tmp/bashio.tar.gz \
+    --strip 1 -C /tmp/bashio \
     \
     && mv /tmp/bashio/lib /usr/lib/bashio \
     && ln -s /usr/lib/bashio/bashio /usr/bin/bashio \
     && rm -fr \
-      /tmp/* \
-      /var/{cache,log}/* \
-      /var/lib/apt/lists/*
+    /tmp/* \
+    /var/{cache,log}/* \
+    /var/lib/apt/lists/*
 
 RUN sed -i "s|/config|/emby|g" /etc/services.d/emby/run \
     && sed -i "s|/config|/emby|g" /etc/cont-init.d/30-config
diff --git a/emby/build.json b/emby/build.json
index 815a20d86..fd7b6ee54 100644
--- a/emby/build.json
+++ b/emby/build.json
@@ -1,9 +1,9 @@
 {
     "build_from": {
-        "armv7": "linuxserver/emby:arm32v7-beta-version-4.6.0.10",
-        "armhf": "linuxserver/emby:arm32v7-beta-version-4.6.0.10",
-        "aarch64": "linuxserver/emby:arm64v8-beta-version-4.6.0.10",
-        "amd64": "linuxserver/emby:amd64-beta-version-4.6.0.10"
+        "armv7": "linuxserver/emby:arm32v7",
+        "armhf": "linuxserver/emby:arm32v7",
+        "aarch64": "linuxserver/emby:arm64v8",
+        "amd64": "linuxserver/emby:amd64"
     },
     "squash": false,
     "args": {}
diff --git a/emby/config.json b/emby/config.json
index 37136459f..8cae24bcf 100644
--- a/emby/config.json
+++ b/emby/config.json
@@ -1,6 +1,6 @@
 {
   "name": "Emby beta NAS",
-  "version": "4.6.0.10",
+  "version": "beta-version-4.6.0.10",
   "slug": "emby_nas",
   "legacy": false,
   "maintenance": {
diff --git a/nextcloud/Dockerfile b/nextcloud/Dockerfile
index f2f22e4d7..f3983adb7 100644
--- a/nextcloud/Dockerfile
+++ b/nextcloud/Dockerfile
@@ -1,6 +1,7 @@
 ARG BUILD_FROM
+ARG BUILD_VERSION
 
-FROM ${BUILD_FROM}
+FROM ${BUILD_FROM}-${BUILD_VERSION}
 
 ENV NEXTCLOUD_PATH="/data/config/www/nextcloud"
 
diff --git a/nextcloud/build.json b/nextcloud/build.json
index 5a45a3e1c..352b4c882 100644
--- a/nextcloud/build.json
+++ b/nextcloud/build.json
@@ -1,10 +1,10 @@
 {
     "squash": false,
     "build_from": {
-        "aarch64": "linuxserver/nextcloud:arm64v8-version-20.0.4",
-        "amd64": "linuxserver/nextcloud:amd64-version-20.0.4",
-        "armhf": "linuxserver/nextcloud:arm32v7-version-20.0.4",
-        "armv7": "linuxserver/nextcloud:arm32v7-version-20.0.4"
+        "aarch64": "linuxserver/nextcloud:arm64v8",
+        "amd64": "linuxserver/nextcloud:amd64",
+        "armhf": "linuxserver/nextcloud:arm32v7",
+        "armv7": "linuxserver/nextcloud:arm32v7"
     },
     "args": {}
 }
diff --git a/radarr/Dockerfile b/radarr/Dockerfile
index f7425a738..2552c0b82 100644
--- a/radarr/Dockerfile
+++ b/radarr/Dockerfile
@@ -1,13 +1,14 @@
 ARG BUILD_FROM
-# hadolint ignore=DL3006
-FROM $BUILD_FROM
+ARG BUILD_VERSION
+
+FROM ${BUILD_FROM}-${BUILD_VERSION}
 
 RUN curl -J -L -o /tmp/bashio.tar.gz \
-        "https://github.com/hassio-addons/bashio/archive/v0.7.1.tar.gz" \
+    "https://github.com/hassio-addons/bashio/archive/v0.7.1.tar.gz" \
     && mkdir /tmp/bashio \
     && tar zxvf \
-        /tmp/bashio.tar.gz \
-        --strip 1 -C /tmp/bashio \
+    /tmp/bashio.tar.gz \
+    --strip 1 -C /tmp/bashio \
     \
     && mv /tmp/bashio/lib /usr/lib/bashio \
     && ln -s /usr/lib/bashio/bashio /usr/bin/bashio \
diff --git a/radarr/build.json b/radarr/build.json
index c9c5a1504..10cd634e0 100644
--- a/radarr/build.json
+++ b/radarr/build.json
@@ -1,13 +1,9 @@
 {
-    "build_from_template": {
-        "image": "linuxserver/radarr",
-        "version": "v0.2.0.1504-ls68"
-    },
     "build_from": {
-        "armhf": "linuxserver/radarr:armhf-v0.2.0.1504-ls68",
-        "armv7": "linuxserver/radarr:arm32v7-v0.2.0.1504-ls68",
-        "aarch64": "linuxserver/radarr:arm64v8-v0.2.0.1504-ls68",
-        "amd64": "linuxserver/radarr:amd64-v0.2.0.1504-ls68"
+        "armhf": "linuxserver/radarr:arm32v7",
+        "armv7": "linuxserver/radarr:arm32v7",
+        "aarch64": "linuxserver/radarr:arm64v8",
+        "amd64": "linuxserver/radarr:amd64"
     },
     "squash": false,
     "args": {}
diff --git a/radarr/config.json b/radarr/config.json
index a5818e8e5..5f8e85615 100644
--- a/radarr/config.json
+++ b/radarr/config.json
@@ -1,6 +1,6 @@
 {
   "name": "radarr NAS",
-  "version": "1.0",
+  "version": "v0.2.0.1504-ls68",
   "slug": "radarr_nas",
   "legacy": false,
   "maintenance": {