diff --git a/.github/workflows/base.yml b/.github/workflows/base.yml
index 585b87f5..79acf2ed 100644
--- a/.github/workflows/base.yml
+++ b/.github/workflows/base.yml
@@ -34,7 +34,7 @@ jobs:
           file: Dockerfile.base
           pull: true
           push: true
-          tags: ${ORG}/github-runner-base:latest
+          tags: ${{ env.ORG }}/github-runner-base:latest
           platforms: linux/amd64,linux/arm64
           cache-from: type=gha
           cache-to: type=gha,mode=max
@@ -64,7 +64,7 @@ jobs:
           file: Dockerfile.base.ubuntu-bionic
           pull: true
           push: true
-          tags: ${ORG}/github-runner-base:ubuntu-bionic
+          tags: ${{ env.ORG }}/github-runner-base:ubuntu-bionic
           platforms: linux/amd64,linux/arm64,linux/arm/v7
           cache-from: type=gha
           cache-to: type=gha,mode=max
@@ -98,7 +98,7 @@ jobs:
           file: Dockerfile.base.debian-${{ matrix.release }}
           pull: true
           push: true
-          tags: ${ORG}/github-runner-base:debian-${{ matrix.release }}
+          tags: ${{ env.ORG }}/github-runner-base:debian-${{ matrix.release }}
           platforms: linux/amd64,linux/arm64,linux/arm/v7
           cache-from: type=gha
           cache-to: type=gha,mode=max
diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index 6d5428f9..6fc81d99 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -34,7 +34,7 @@ jobs:
           file: Dockerfile
           pull: true
           push: true
-          tags: ${ORG}/github-runner:latest
+          tags: ${{ env.ORG }}/github-runner:latest
           platforms: linux/amd64,linux/arm64
           cache-from: type=gha
           cache-to: type=gha,mode=max
@@ -64,7 +64,7 @@ jobs:
           file: Dockerfile.ubuntu-bionic
           pull: true
           push: true
-          tags: ${ORG}/github-runner:ubuntu-bionic
+          tags: ${{env.ORG}}/github-runner:ubuntu-bionic
           platforms: linux/amd64,linux/arm64,linux/arm/v7
           cache-from: type=gha
           cache-to: type=gha,mode=max
@@ -98,7 +98,7 @@ jobs:
           file: Dockerfile.debian-${{ matrix.release }}
           pull: true
           push: true
-          tags: ${ORG}/github-runner:debian-${{ matrix.release }}
+          tags: ${{ env.ORG }}/github-runner:debian-${{ matrix.release }}
           platforms: linux/amd64,linux/arm64,linux/arm/v7
           cache-from: type=gha
           cache-to: type=gha,mode=max
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index f323017d..80a65b42 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -47,7 +47,7 @@ jobs:
           file: Dockerfile
           pull: true
           push: true
-          tags: ${ORG}/github-runner:${TAG}
+          tags: ${{ env.ORG }}/github-runner:${{ env.TAG }}
           platforms: linux/amd64,linux/arm64
           cache-from: type=gha
           cache-to: type=gha,mode=max
@@ -82,7 +82,7 @@ jobs:
           file: Dockerfile.ubuntu-bionic
           pull: true
           push: true
-          tags: ${ORG}/github-runner:${TAG}-ubuntu-bionic
+          tags: ${{ env.ORG }}/github-runner:${{ env.TAG }}-ubuntu-bionic
           platforms: linux/amd64,linux/arm64,linux/arm/v7
           cache-from: type=gha
           cache-to: type=gha,mode=max
@@ -119,7 +119,7 @@ jobs:
           file: Dockerfile.debian-${{ matrix.release }}
           pull: true
           push: true
-          tags: ${ORG}/github-runner:${TAG}-debian-${{ matrix.release }}
+          tags: ${{ env.ORG }}/github-runner:${{ env.TAG }}-debian-${{ matrix.release }}
           platforms: linux/amd64,linux/arm64,linux/arm/v7
           cache-from: type=gha
           cache-to: type=gha,mode=max
\ No newline at end of file