diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 95c706f..0ca0fd9 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -19,17 +19,18 @@ jobs:
         with:
           username: ${{ secrets.DOCKERHUB_USER }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
-      - name: Set up QEMU # to build multitarget containers
-        uses: docker/setup-qemu-action@v3
+      # - name: Set up QEMU # to build multitarget containers
+      #   uses: docker/setup-qemu-action@v3
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3
       - name: Build image
         uses: docker/build-push-action@v5
         with:
           context: src
-          platforms: linux/amd64,linux/arm64
+          # platforms: linux/amd64,linux/arm64
+          platforms: linux/amd64
           push: ${{ (github.event_name == 'push' && (github.ref == 'refs/heads/master' || github.ref == 'refs/heads/main')) || github.event_name == 'workflow_dispatch' }}
           tags: >-
-            zondax/builder-zemu:${{ steps.hash.outputs.hash }},
-            zondax/builder-zemu:latest,
-            zondax/builder-zemu:speculos-${{ steps.hash.outputs.speculosHash }}
+            lightsailnetwork/builder-zemu:${{ steps.hash.outputs.hash }},
+            lightsailnetwork/builder-zemu:latest,
+            lightsailnetwork/builder-zemu:speculos-${{ steps.hash.outputs.speculosHash }}
diff --git a/Makefile b/Makefile
index 30fb247..bfa4b87 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-DOCKER_IMAGE=zondax/builder-zemu
+DOCKER_IMAGE=lightsailnetwork/builder-zemu
 
 INTERACTIVE:=$(shell [ -t 0 ] && echo 1)