diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 95c706f..13d303e 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -1,6 +1,8 @@
 name: Build and release
 on:
   push:
+    branches:
+      - master
   workflow_dispatch:
 
 jobs:
@@ -14,11 +16,12 @@ jobs:
         run: |
           echo "speculosHash=$(git ls-remote https://github.com/LedgerHQ/speculos | head -n 1 | awk '{print $1}')" >> $GITHUB_OUTPUT
           echo "hash=$(git rev-parse --short HEAD)" >> $GITHUB_OUTPUT
-      - name: Login to Docker Hub
+      - name: Login to GitHub Container Registry
         uses: docker/login-action@v3
         with:
-          username: ${{ secrets.DOCKERHUB_USER }}
-          password: ${{ secrets.DOCKERHUB_TOKEN }}
+          registry: ghcr.io
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
       - name: Set up QEMU # to build multitarget containers
         uses: docker/setup-qemu-action@v3
       - name: Set up Docker Buildx
@@ -30,6 +33,6 @@ jobs:
           platforms: linux/amd64,linux/arm64
           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 }}
+            ghcr.io/${{ github.repository_owner }}/builder-zemu:${{ steps.hash.outputs.hash }},
+            ghcr.io/${{ github.repository_owner }}/builder-zemu:latest,
+            ghcr.io/${{ github.repository_owner }}/builder-zemu:speculos-${{ steps.hash.outputs.speculosHash }}