diff --git a/.github/workflows/docker-stable.yml b/.github/workflows/docker-stable.yml
index 0f113b0..4461498 100644
--- a/.github/workflows/docker-stable.yml
+++ b/.github/workflows/docker-stable.yml
@@ -27,6 +27,12 @@ jobs:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
 
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v3
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+
       - name: Build & Push Stable Docker
         uses: docker/build-push-action@v5
         with:
diff --git a/.github/workflows/pr-preview.yml b/.github/workflows/pr-preview.yml
index 8fdd667..cc97ac2 100644
--- a/.github/workflows/pr-preview.yml
+++ b/.github/workflows/pr-preview.yml
@@ -140,6 +140,12 @@ jobs:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
 
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v3
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+
       - name: Build & Push Docker Preview
         if: steps.verify_package.outputs.success == 'true'
         uses: docker/build-push-action@v5
@@ -147,7 +153,9 @@ jobs:
           VERSION: ${{ env.VERSION }}
         with:
           push: true
-          tags: socketdev/cli:pr-${{ github.event.pull_request.number }}
+          platforms: linux/amd64,linux/arm64
+          tags: |
+            socketdev/cli:pr-${{ github.event.pull_request.number }}
           build-args: |
             CLI_VERSION=${{ env.VERSION }}
             PIP_INDEX_URL=https://test.pypi.org/simple
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 1004ce6..abf4e0b 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -66,6 +66,12 @@ jobs:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
 
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v3
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+
       - name: Verify package is installable
         id: verify_package
         env:
diff --git a/scripts/build_container.sh b/scripts/build_container.sh
index a0c2a1b..de96fa0 100755
--- a/scripts/build_container.sh
+++ b/scripts/build_container.sh
@@ -26,8 +26,8 @@ if [ $ENABLE_PYPI_BUILD = "pypi-build=test" ]; then
   python -m build --wheel --sdist
   twine upload --repository testpypi dist/*$VERSION*
   sleep 120
-  docker build --no-cache --build-arg CLI_VERSION=$VERSION --platform linux/amd64,linux/arm64 -t socketdev/cli:$VERSION . \
-    && docker build --no-cache --build-arg CLI_VERSION=$VERSION --platform linux/amd64,linux/arm64 -t socketdev/cli:latest . \
+  docker build --no-cache --build-arg CLI_VERSION=$VERSION --platform linux/amd64,linux/arm64 -t socketdev/cli:$VERSION-test . \
+    && docker build --no-cache --build-arg CLI_VERSION=$VERSION --platform linux/amd64,linux/arm64 -t socketdev/cli:test . \
     && docker push socketdev/cli:$VERSION-test \
     && docker push socketdev/cli:test
 fi