diff --git a/.github/workflows/docker-build.yml b/.github/workflows/docker-build.yml
index 57100ec2..521f6238 100644
--- a/.github/workflows/docker-build.yml
+++ b/.github/workflows/docker-build.yml
@@ -37,8 +37,7 @@ jobs:
         run: |
           ARCHITECTURE=${{ matrix.architecture }}
           echo ::set-output name=VERSION::${{ github.event.release.tag_name }}
-          echo ::set-output name=platform::${ARCHITECTURE//-/\/}
-
+          echo ::set-output name=platform::${ARCHITECTURE}
       - name: Set current date as env variable
         id: date_time
         run: echo ::set-output name=NOW::$(date +'%Y-%m-%dT%H:%M:%S')
@@ -77,8 +76,8 @@ jobs:
         if: ${{ github.event.release.target_commitish == 'master' }}
         uses: docker/build-push-action@v2
         with:
-          context: .
-          platforms: linux/amd64,linux/arm/v7,linux/arm64
+          file: ./Dockerfile.${{ matrix.architecture }}
+          platforms: ${{ matrix.architecture }
           push: ${{ github.event_name != 'pull_request' }}
           tags: latest, ${{ steps.prep.outputs.VERSION }}
           labels: ${{ steps.metadata.outputs.labels }}
@@ -88,8 +87,8 @@ jobs:
         if: ${{ github.event.inputs.branch == 'master' }}
         uses: docker/build-push-action@v2
         with:
-          context: .
-          platforms: linux/amd64,linux/arm/v7,linux/arm64
+          file: ./Dockerfile.${{ matrix.architecture }}
+          platforms: ${{ matrix.architecture }
           push: ${{ github.event_name != 'pull_request' }}
           tags: latest, ${{ github.event.inputs.tag }}
           labels: ${{ steps.metadata.outputs.labels }}
@@ -99,8 +98,8 @@ jobs:
         if: ${{ github.ref == 'refs/heads/develop' || github.event.inputs.branch == 'develop' }}
         uses: docker/build-push-action@v2
         with:
-          context: .
-          platforms: linux/amd64,linux/arm/v7,linux/arm64
+          file: ./Dockerfile.${{ matrix.architecture }}
+          platforms: ${{ matrix.architecture }
           push: ${{ github.event_name != 'pull_request' }}
           tags: ${{ steps.metadata.outputs.tags }}
           labels: ${{ steps.metadata.outputs.labels }}
@@ -111,8 +110,8 @@ jobs:
         uses: docker/build-push-action@v2
         with:
           file: ./Dockerfile.${{ matrix.architecture }}
-          platforms: ${{ steps.prep.outputs.platform }}
+          platforms: ${{ matrix.architecture }
           push: ${{ github.event_name != 'pull_request' }}
           tags: ${{ steps.metadata.outputs.tags }}
           labels: ${{ steps.metadata.outputs.labels }}
-          build-args: TP_RELEASE=${{ steps.prep.outputs.VERSION }},BUILD_DATE=${{ steps.date_time.outputs.NOW }}
+          build-args: TP_RELEASE=${{ steps.prep.outputs.VERSION }},BUILD_DATE=${{ steps.date_time.outputs.NOW }}, PLATFORM=${{ steps.prep.outputs.platform }}
diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64
index 4c28392c..d1dd2f0e 100644
--- a/Dockerfile.aarch64
+++ b/Dockerfile.aarch64
@@ -1,9 +1,9 @@
-FROM ghcr.io/linuxserver/baseimage-alpine:arm64v8-3.14
+FROM --platform=${BUILDPLATFORM}  ghcr.io/linuxserver/baseimage-alpine:arm64v8-3.14
 
 # set version label
 ARG BUILD_DATE
 ARG TP_RELEASE
-LABEL build_version="Version:- ${VERSION} Build-date:- ${BUILD_DATE} Platform: ${BUILDPLATFORM}"
+LABEL build_version="Version:- ${VERSION} Build-date:- ${BUILD_DATE} Platform: ${ARCHITECTURE}"
 LABEL maintainer="gilbn"
 LABEL org.opencontainers.image.description DESCRIPTION
 
diff --git a/Dockerfile.amd64 b/Dockerfile.amd64
index bd3c4ed5..d62c35f7 100644
--- a/Dockerfile.amd64
+++ b/Dockerfile.amd64
@@ -1,9 +1,9 @@
-FROM ghcr.io/linuxserver/baseimage-alpine-nginx:3.14
+FROM --platform=${BUILDPLATFORM} ghcr.io/linuxserver/baseimage-alpine-nginx:3.14
 
 # set version label
 ARG BUILD_DATE
 ARG TP_RELEASE
-LABEL build_version="Version:- ${VERSION} Build-date:- ${BUILD_DATE} Platform: ${BUILDPLATFORM}"
+LABEL build_version="Version:- ${VERSION} Build-date:- ${BUILD_DATE} Platform: ${ARCHITECTURE}"
 LABEL maintainer="gilbn"
 LABEL org.opencontainers.image.description DESCRIPTION
 
diff --git a/Dockerfile.armhf b/Dockerfile.armhf
index 9a20b507..10574560 100644
--- a/Dockerfile.armhf
+++ b/Dockerfile.armhf
@@ -1,9 +1,9 @@
-FROM ghcr.io/linuxserver/baseimage-alpine:arm32v7-3.14
+FROM --platform=${BUILDPLATFORM} ghcr.io/linuxserver/baseimage-alpine:arm32v7-3.14
 
 # set version label
 ARG BUILD_DATE
 ARG TP_RELEASE
-LABEL build_version="Version:- ${VERSION} Build-date:- ${BUILD_DATE} Platform: ${BUILDPLATFORM}"
+LABEL build_version="Version:- ${VERSION} Build-date:- ${BUILD_DATE} Platform: ${ARCHITECTURE}"
 LABEL maintainer="gilbn"
 LABEL org.opencontainers.image.description DESCRIPTION