diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 3b8798a53..241f8e002 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -47,13 +47,15 @@ jobs:
     runs-on: ubuntu-18.04
     steps:
       - uses: actions/checkout@v2
-      - uses: docker/build-push-action@v1
+      - uses: azure/docker-login@v1
         with:
+          login-server: docker.pkg.github.com
           username: $GITHUB_ACTOR
           password: ${{ secrets.GITHUB_TOKEN }}
-          registry: docker.pkg.github.com
-          repository: cloudfire-llc/cloudfire-ce/cloudfire
-          tag: ${GITHUB_SHA::8}
+      - run: |
+        export IMAGE=docker.pkg.github.com/cloudfire-llc/cloudfire-ce/cloudfire:${GITHUB_SHA::8}
+        docker build -t $IMAGE .
+        docker push $IMAGE
 
   # 3. Functional Test
   docker-compose-up: