diff --git a/.gitea/workflows/build.yml b/.gitea/workflows/build.yml
index 4561b758..c0cbc9f6 100644
--- a/.gitea/workflows/build.yml
+++ b/.gitea/workflows/build.yml
@@ -36,6 +36,10 @@ jobs:
           registry: gitea.technocloud.ee
           username: ${{ secrets.DOCKER_USERNAME }}
           password: ${{ secrets.DOCKER_PASSWORD }}
+      - name: Get Meta
+        id: meta
+        run: |
+          echo "REPO_NAME=${GITHUB_REPOSITORY}" >> $GITHUB_OUTPUT
       - name: Build and Push AMD64
         id: build-docker
         uses: docker/build-push-action@v5
@@ -45,7 +49,7 @@ jobs:
           platforms: linux/amd64
           push: true
           provenance: false
-          outputs: type=image,name=gitea.technocloud.ee/${GITHUB_REPOSITORY},push-by-digest=true
+          outputs: type=image,name=gitea.technocloud.ee/${{ steps.meta.outputs.REPO_NAME }},push-by-digest=true
       - name: Summarize the Docker digest
         id: digest
         run: |
@@ -84,6 +88,10 @@ jobs:
           registry: gitea.technocloud.ee
           username: ${{ secrets.DOCKER_USERNAME }}
           password: ${{ secrets.DOCKER_PASSWORD }}
+      - name: Get Meta
+        id: meta
+        run: |
+          echo "REPO_NAME=${GITHUB_REPOSITORY}" >> $GITHUB_OUTPUT
       - name: Build and Push ARM64
         id: build-docker
         uses: docker/build-push-action@v6
@@ -93,7 +101,7 @@ jobs:
           platforms: linux/arm64
           push: true
           provenance: false
-          outputs: type=image,name=gitea.technocloud.ee/${GITHUB_REPOSITORY},push-by-digest=true
+          outputs: type=image,name=gitea.technocloud.ee/${{ steps.meta.outputs.REPO_NAME }},push-by-digest=true
       - name: Summarize the Docker digest
         id: digest
         run: |
@@ -107,8 +115,6 @@ jobs:
     needs: [build-arm64, build-amd64]
     runs-on: ubuntu-latest
     name: Create Multi-arch Manifest
-    env:
-      DOCKER_ORG: technocloud-public
     strategy:
       matrix:
         python-version: ['3.10']
@@ -128,6 +134,7 @@ jobs:
       - name: Get Repository Metadata
         id: meta
         run: |
+          echo "REPO_NAME=${GITHUB_REPOSITORY}" >> $GITHUB_OUTPUT
           echo "PY_VERSION=digest-$(echo ${{ matrix.python-version }} | sed 's/\./-/g')" >> $GITHUB_OUTPUT
 
       - name: Create and Push Multi-arch Manifest
@@ -138,6 +145,6 @@ jobs:
           AMD_DIGEST=${{ needs.build-amd64.outputs[steps.meta.outputs.PY_VERSION] }}
           echo $ARM_DIGEST
           echo $AMD_DIGEST
-          IMAGE_NAME=gitea.technocloud.ee/${GITHUB_REPOSITORY}:python${{ matrix.python-version }}
+          IMAGE_NAME=gitea.technocloud.ee/${{ steps.meta.outputs.REPO_NAME }}:python${{ matrix.python-version }}
           docker manifest create $IMAGE_NAME --amend gitea.technocloud.ee/technocloud-public/nginx-unit@${ARM_DIGEST} --amend gitea.technocloud.ee/technocloud-public/nginx-unit@${AMD_DIGEST}
           docker manifest push $IMAGE_NAME
\ No newline at end of file