diff --git a/.github/workflows/release-container.yaml b/.github/workflows/release-container.yaml
index 28cd4122a..4e79c9a93 100644
--- a/.github/workflows/release-container.yaml
+++ b/.github/workflows/release-container.yaml
@@ -6,6 +6,9 @@ on:
   release:
     types: [published]
 
+env:
+  CONTAINER_IMAGE: "ghcr.io/${{ github.repository }}"
+
 jobs:
   context:
     runs-on: ubuntu-latest
@@ -15,6 +18,10 @@ jobs:
       packages: write
 
     steps:
+    - name: downcase CONTAINER_IMAGE
+      run: |
+        echo "CONTAINER_IMAGE=${CONTAINER_IMAGE,,}" >> ${GITHUB_ENV}
+
     - name: Set up Docker Buildx
       uses: docker/setup-buildx-action@v2
 
@@ -31,14 +38,10 @@ jobs:
         github-token: ${{ secrets.GITHUB_TOKEN }}
         push: true
 
-        registry: ghcr.io
-        organization: "${{ github.event.repository.owner.login }}"
-        repository: "${{ github.event.repository.name }}"
-
         platforms: |
           linux/amd64
           linux/arm64
 
         tags: |
-          latest
-          ${{ github.event.release.tag_name }}
+          ${{ env.CONTAINER_IMAGE }}:latest
+          ${{ env.CONTAINER_IMAGE }}:${{ github.event.release.tag_name }}
diff --git a/.github/workflows/testing-container.yaml b/.github/workflows/testing-container.yaml
index 6d43f996a..6e6920501 100644
--- a/.github/workflows/testing-container.yaml
+++ b/.github/workflows/testing-container.yaml
@@ -7,6 +7,9 @@ on:
     branches:
       - 'develop'
 
+env:
+  CONTAINER_IMAGE: "ghcr.io/${{ github.repository }}"
+
 jobs:
   context:
     runs-on: ubuntu-latest
@@ -16,6 +19,10 @@ jobs:
       packages: write
 
     steps:
+    - name: downcase CONTAINER_IMAGE
+      run: |
+        echo "CONTAINER_IMAGE=${CONTAINER_IMAGE,,}" >> ${GITHUB_ENV}
+
     - name: Set up Docker Buildx
       uses: docker/setup-buildx-action@v2
 
@@ -32,14 +39,10 @@ jobs:
         github-token: ${{ secrets.GITHUB_TOKEN }}
         push: true
 
-        registry: ghcr.io
-        organization: "${{ github.event.repository.owner.login }}"
-        repository: "${{ github.event.repository.name }}"
-
         platforms: |
           linux/amd64
           linux/arm64
 
         tags: |
-          develop
-          ${{ github.sha }}
+          ${{ env.CONTAINER_IMAGE }}:develop
+          ${{ env.CONTAINER_IMAGE }}:${{ github.sha }}