diff --git a/.gitea/workflows/build-base.yml b/.gitea/workflows/build-base.yml
index b986b2c..208627e 100644
--- a/.gitea/workflows/build-base.yml
+++ b/.gitea/workflows/build-base.yml
@@ -24,7 +24,7 @@ jobs:
       - name: Login to registry
         uses: docker/login-action@v3
         with:
-          registry: ${{ secrets.REGISTRY_URL }}
+          registry: ${{ vars.REGISTRY_URL }}
           username: ${{ secrets.REGISTRY_USER }}
           password: ${{ secrets.REGISTRY_PASSWORD }}
 
@@ -34,4 +34,4 @@ jobs:
           context: .
           file: ./Dockerfile.base
           push: true
-          tags: ${{ vars.CI_REGISTRY_IMAGE }}:latest
\ No newline at end of file
+          tags: ${{ vars.REGISTRY_URL }}/${{ secrets.REGISTRY_USER }}/coder-base:latest
\ No newline at end of file
diff --git a/.gitea/workflows/build-cli.yml b/.gitea/workflows/build-cli.yml
index 691faae..2c318c8 100644
--- a/.gitea/workflows/build-cli.yml
+++ b/.gitea/workflows/build-cli.yml
@@ -27,7 +27,7 @@ jobs:
       - name: Login to registry
         uses: docker/login-action@v3
         with:
-          registry: ${{ secrets.REGISTRY_URL }}
+          registry: ${{ vars.REGISTRY_URL }}
           username: ${{ secrets.REGISTRY_USER }}
           password: ${{ secrets.REGISTRY_PASSWORD }}
 
@@ -37,4 +37,4 @@ jobs:
           context: .
           file: ./tools/coder-cli/Dockerfile
           push: true
-          tags: ${{ vars.CI_REGISTRY_IMAGE }}:cli
\ No newline at end of file
+          tags: ${{ vars.REGISTRY_URL }}/${{ secrets.REGISTRY_USER }}/coder-base:cli
\ No newline at end of file
diff --git a/.gitea/workflows/build-terraform-shell.yml b/.gitea/workflows/build-terraform-shell.yml
index d9f589b..c140548 100644
--- a/.gitea/workflows/build-terraform-shell.yml
+++ b/.gitea/workflows/build-terraform-shell.yml
@@ -27,7 +27,7 @@ jobs:
       - name: Login to registry
         uses: docker/login-action@v3
         with:
-          registry: ${{ secrets.REGISTRY_URL }}
+          registry: ${{ vars.REGISTRY_URL }}
           username: ${{ secrets.REGISTRY_USER }}
           password: ${{ secrets.REGISTRY_PASSWORD }}
 
@@ -37,4 +37,4 @@ jobs:
           context: .
           file: ./tools/terraform-shell/Dockerfile
           push: true
-          tags: ${{ vars.CI_REGISTRY_IMAGE }}:terraform
\ No newline at end of file
+          tags: ${{ vars.REGISTRY_URL }}/${{ secrets.REGISTRY_USER }}/coder-base:terraform
\ No newline at end of file