diff --git a/.gitea/workflows/build-base.yml b/.gitea/workflows/build-base.yml
index 4d1f1c5..fa706c1 100644
--- a/.gitea/workflows/build-base.yml
+++ b/.gitea/workflows/build-base.yml
@@ -10,10 +10,6 @@ on:
     - cron: '@monthly'
   workflow_dispatch:
 
-env:
-  REGISTRY_URL: ${{ secrets.REGISTRY_URL }}
-  REGISTRY_IMAGE_NAME: ${{ secrets.REGISTRY_IMAGE_NAME }}
-
 jobs:
   build:
     name: Build Base Image
@@ -38,4 +34,4 @@ jobs:
           context: .
           file: ./Dockerfile.base
           push: true
-          tags: ${{ env.REGISTRY_IMAGE_NAME }}:latest
\ No newline at end of file
+          tags: ${{ vars.CI_REGISTRY_IMAGE }}:latest
\ No newline at end of file
diff --git a/.gitea/workflows/build-cli.yml b/.gitea/workflows/build-cli.yml
index c4af75a..c6a57b7 100644
--- a/.gitea/workflows/build-cli.yml
+++ b/.gitea/workflows/build-cli.yml
@@ -10,10 +10,6 @@ on:
     - cron: '@monthly'
   workflow_dispatch:
 
-env:
-  REGISTRY_URL: ${{ secrets.REGISTRY_URL }}
-  REGISTRY_IMAGE_NAME: ${{ secrets.REGISTRY_IMAGE_NAME }}
-
 jobs:
   build:
     name: Build CLI Image
@@ -41,4 +37,4 @@ jobs:
           context: .
           file: ./tools/coder-cli/Dockerfile
           push: true
-          tags: ${{ env.REGISTRY_IMAGE_NAME }}:cli
\ No newline at end of file
+          tags: ${{ vars.CI_REGISTRY_IMAGE }}:cli
\ No newline at end of file
diff --git a/.gitea/workflows/build-terraform-shell.yml b/.gitea/workflows/build-terraform-shell.yml
index 8a97914..b469dac 100644
--- a/.gitea/workflows/build-terraform-shell.yml
+++ b/.gitea/workflows/build-terraform-shell.yml
@@ -41,4 +41,4 @@ jobs:
           context: .
           file: ./tools/terraform-shell/Dockerfile
           push: true
-          tags: ${{ env.REGISTRY_IMAGE_NAME }}:terraform
\ No newline at end of file
+          tags: ${{ vars.CI_REGISTRY_IMAGE }}:terraform
\ No newline at end of file