diff --git a/.gitea/workflows/build-push-docker.yml b/.gitea/workflows/build-push-docker.yml
index 5f63261..6cb933e 100644
--- a/.gitea/workflows/build-push-docker.yml
+++ b/.gitea/workflows/build-push-docker.yml
@@ -20,22 +20,23 @@ jobs:
 
             - name: Build Docker Image
               env:
-                  RELEASE_TAG: ${{ github.ref }}
+                  RELEASE_TAG: ${{ github.ref_name }}
                   SHORT_HASH: ${{ github.sha }}
+                  USER_NAME: ${{ github.repository_owner }}
               run: |
                   # Build the image with the commit hash tag
-                  docker build --build-arg BUILD_IDENTIFIER=${SHORT_HASH:0:5} -t gitea.innovativename.xyz/Cleo/archipelago-server-docker:${RELEASE_TAG} .
+                  docker build --build-arg BUILD_IDENTIFIER=${SHORT_HASH:0:5} -t gitea.innovativename.xyz/${USER_NAME}/archipelago-server-docker:${RELEASE_TAG} .
 
                   # Tag the same image as "latest"
-                  docker tag gitea.innovativename.xyz/Cleo/archipelago-server-docker:${RELEASE_TAG} gitea.innovativename.xyz/Cleo/archipelago-server-docker:latest
+                  docker tag gitea.innovativename.xyz/${USER_NAME}/archipelago-server-docker:${RELEASE_TAG} gitea.innovativename.xyz/${USER_NAME}/archipelago-server-docker:latest
 
             - name: Push Docker Images
               env:
-                  RELEASE_TAG: ${{ github.ref }}
+                  RELEASE_TAG: ${{ github.ref_name }}
                   SHORT_HASH: ${{ github.sha }}
               run: |
-                  docker push gitea.innovativename.xyz/Cleo/archipelago-server-docker:${RELEASE_TAG}
-                  docker push gitea.innovativename.xyz/Cleo/archipelago-server-docker:latest
+                  docker push gitea.innovativename.xyz/${USER_NAME}/archipelago-server-docker:${RELEASE_TAG}
+                  docker push gitea.innovativename.xyz/${USER_NAME}/archipelago-server-docker:latest
 
             - name: Log out from registry
               if: always()