diff --git a/.github/workflows/dockerhub-dev.yml b/.github/workflows/dockerhub-dev.yml
index 46b622c99..3c5ea2e2c 100644
--- a/.github/workflows/dockerhub-dev.yml
+++ b/.github/workflows/dockerhub-dev.yml
@@ -43,28 +43,14 @@ jobs:
           push: true
           tags: 0xpolygon/issuernode-ui:${{ env.IMAGE_TAG }}
 
-      - name: Build and push amd64 image
+      - name: Build and push amd64 and arm64 image
         uses: docker/build-push-action@v4
         env:
           IMAGE_TAG: ${{ steps.version.outputs.VERSION }}
         with:
           context: .
-          platforms: linux/amd64
+          platforms: linux/amd64,linux/arm64
           push: true
           tags: 0xpolygon/issuernode:${{ env.IMAGE_TAG }}
 
-      - name: Rename Docker Arm File
-        run: |
-          mv Dockerfile Dockerfile-amd
-          mv Dockerfile-arm Dockerfile
-
-      - name: Build and push arm64 image
-        uses: docker/build-push-action@v4
-        env:
-          IMAGE_TAG: ${{ steps.version.outputs.VERSION }}
-        with:
-          context: .
-          platforms: linux/arm64
-          push: true
-          tags: 0xpolygon/issuernode-arm:${{ env.IMAGE_TAG }}
 
diff --git a/.github/workflows/dockerhub-main.yml b/.github/workflows/dockerhub-main.yml
index 0cf3a92ad..159e6cef1 100644
--- a/.github/workflows/dockerhub-main.yml
+++ b/.github/workflows/dockerhub-main.yml
@@ -37,27 +37,12 @@ jobs:
           push: true
           tags: 0xpolygon/issuernode-ui:${{ env.IMAGE_TAG }}
 
-      - name: Build and push amd64 image
+      - name: Build and push amd64 and arm64 image
         uses: docker/build-push-action@v4
         env:
           IMAGE_TAG: latest
         with:
           context: .
-          platforms: linux/amd64
+          platforms: linux/amd64,linux/arm64
           push: true
-          tags: 0xpolygon/issuernode:${{ env.IMAGE_TAG }}
-
-      - name: Rename Docker Arm File
-        run: |
-          mv Dockerfile Dockerfile-amd
-          mv Dockerfile-arm Dockerfile
-
-      - name: Build and push arm64 image
-        uses: docker/build-push-action@v4
-        env:
-          IMAGE_TAG: latest
-        with:
-          context: .
-          platforms: linux/arm64
-          push: true
-          tags: 0xpolygon/issuernode-arm:${{ env.IMAGE_TAG }}
\ No newline at end of file
+          tags: 0xpolygon/issuernode:${{ env.IMAGE_TAG }}
\ No newline at end of file