diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index ab8722d33..348bf8961 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -50,9 +50,9 @@ jobs:
         with:
           username: $GITHUB_ACTOR
           password: ${{ secrets.GITHUB_TOKEN }}
+          registry: docker.pkg.github.com
           repository: docker.pkg.github.com/cloudfire-llc/cloudfire-ce/cloudfire
-          tag_with_ref: true
-          tag_with_sha: true
+          tag: ${GITHUB_SHA::8}
 
   # 3. Functional Test
   docker-compose-up: