diff --git a/.github/workflows/docker-cd-dev.yml b/.github/workflows/docker-cd-dev.yml
index 2f2aea9e..f98ef884 100644
--- a/.github/workflows/docker-cd-dev.yml
+++ b/.github/workflows/docker-cd-dev.yml
@@ -12,6 +12,9 @@ jobs:
     - name: Checkout Repository
       uses: actions/checkout@v2
       
+    - name: Setup Docker Buildx
+      uses: docker/setup-buildx-action@v2
+      
     - name: Log in to Docker Hub
       uses: docker/login-action@v1
       with:
@@ -19,8 +22,9 @@ jobs:
         password: ${{ secrets.DOCKER_TOKEN }}
       
     - name: Build and push Server Docker image
-      uses: docker/build-push-action@v2
+      uses: docker/build-push-action@v4
       with:
         context: .
+        platforms: linux/amd64,linux/arm64
         push: true
         tags: codexrems/dtr:REMSvExperimental
diff --git a/.github/workflows/docker-cd.yml b/.github/workflows/docker-cd.yml
index b68641b9..5ea39e75 100644
--- a/.github/workflows/docker-cd.yml
+++ b/.github/workflows/docker-cd.yml
@@ -12,6 +12,9 @@ jobs:
     - name: Checkout Repository
       uses: actions/checkout@v2
       
+    - name: Setup Docker Buildx
+      uses: docker/setup-buildx-action@v2
+      
     - name: Log in to Docker Hub
       uses: docker/login-action@v1
       with:
@@ -19,8 +22,9 @@ jobs:
         password: ${{ secrets.DOCKER_TOKEN }}
       
     - name: Build and push Server Docker image
-      uses: docker/build-push-action@v2
+      uses: docker/build-push-action@v4
       with:
         context: .
+        platforms: linux/amd64,linux/arm64
         push: true
         tags: codexrems/dtr:REMSvCurrent