diff --git a/.gitea/workflows/build.yml b/.gitea/workflows/build.yml
index cfafa31..c5faaa0 100644
--- a/.gitea/workflows/build.yml
+++ b/.gitea/workflows/build.yml
@@ -32,22 +32,22 @@ jobs:
         run: |
           bash build-and-copy.sh -t ${IMAGE_NAME}:${IMAGE_TAG}
 
-      - name: Tag image
+      - name: Tag and Push Docker Image
+        shell: bash
         run: |
-          docker tag \
-            ${IMAGE_NAME}:${IMAGE_TAG} \
-            ${{ secrets.REGISTRY_HOST }}/${IMAGE_NAME}:${IMAGE_TAG}
+          VERSION=${GITEA_SHA::7}
+
+          REGISTRY=${GITHUB_SERVER_URL#https://}
+
+          TARGET_IMAGE=$REGISTRY/${{ github.repository_owner }}/${IMAGE_NAME}
 
           docker tag \
             ${IMAGE_NAME}:${IMAGE_TAG} \
-            ${{ secrets.REGISTRY_HOST }}/${IMAGE_NAME}:${GITEA_SHA::7}
+            $TARGET_IMAGE:$VERSION
 
-      - name: Push latest
-        run: |
-          docker push \
-            ${{ secrets.REGISTRY_HOST }}/${IMAGE_NAME}:${IMAGE_TAG}
+          docker tag \
+            ${IMAGE_NAME}:${IMAGE_TAG} \
+            $TARGET_IMAGE:latest
 
-      - name: Push commit SHA
-        run: |
-          docker push \
-            ${{ secrets.REGISTRY_HOST }}/${IMAGE_NAME}:${GITEA_SHA::7}
+          docker push $TARGET_IMAGE:$VERSION
+          docker push $TARGET_IMAGE:latest