diff --git a/.gitea/workflows/docker.yaml b/.gitea/workflows/docker.yaml
index 9da50c3..e3e0f7b 100644
--- a/.gitea/workflows/docker.yaml
+++ b/.gitea/workflows/docker.yaml
@@ -27,15 +27,13 @@ jobs:
         run: docker build -t pontus-bot:latest .
 
       - name: Tag Docker Image
-        run: docker tag pontus-bot:latest $SERVER_URL/$OWNER/pontus-bot:latest
+        run: docker tag "$IMAGE_NAME:latest" "$GITEA_SERVER/$GITEA_OWNER/$IMAGE_NAME:latest"
         env:
           SERVER_URL: ${{ secrets.SERVER_URL }}
           OWNER: ${{ secrets.OWNER }}
-          IMAGE_NAME: ${{ secrets.IMAGE_NAME }}
 
       - name: Push Docker Image
-        run: docker push $SERVER_URL/$OWNER/pontus-bot:latest
+        run: docker push "$GITEA_SERVER/$GITEA_OWNER/$IMAGE_NAME:latest"
         env:
           SERVER_URL: ${{ secrets.SERVER_URL }}
           OWNER: ${{ secrets.OWNER }}
-          IMAGE_NAME: ${{ secrets.IMAGE_NAME }}