diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index ed9574d..0f82e5d 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -5,8 +5,8 @@ on:
     branches: ["main"]
 
 env:
-  REGISTRY: us-central1-docker.pkg.dev
-  IMAGE: quic-video/deploy/moq-rs:latest
+  REGISTRY: docker.io
+  IMAGE: ${{ github.repository }}
   SERVICE: api # Restart the API service TODO and relays
 
 jobs:
@@ -28,19 +28,10 @@ jobs:
       # I'm paying for Depot for faster ARM builds.
       - uses: depot/setup-action@v1
 
-      # Log in to GCP
-      - uses: google-github-actions/auth@v1
-        id: auth
+      - uses: docker/login-action@v3
         with:
-          token_format: access_token
-          credentials_json: ${{ secrets.GCP_SERVICE_ACCOUNT_KEY }}
-
-      # Log into the docker registry via the GCP token
-      - uses: docker/login-action@v1
-        with:
-          registry: ${{ env.REGISTRY }}
-          username: oauth2accesstoken
-          password: ${{ steps.auth.outputs.access_token }}
+          username: ${{ secrets.DOCKER_USERNAME }}
+          password: ${{ secrets.DOCKER_PASSWORD }}
 
       # Build and push Docker image with Depot
       - uses: depot/build-push-action@v1
@@ -51,6 +42,11 @@ jobs:
           tags: ${{env.REGISTRY}}/${{env.IMAGE}}
           platforms: linux/amd64,linux/arm64
 
+      # Log in to GCP
+      - uses: google-github-actions/auth@v1
+        with:
+          credentials_json: ${{ secrets.GCP_SERVICE_ACCOUNT_KEY }}
+
       # Deploy to cloud run
       - uses: google-github-actions/deploy-cloudrun@v1
         with: