diff --git a/.gitea/workflows/deploy_staging.yaml b/.gitea/workflows/deploy_staging.yaml
index bcedb55..8593a02 100644
--- a/.gitea/workflows/deploy_staging.yaml
+++ b/.gitea/workflows/deploy_staging.yaml
@@ -48,10 +48,9 @@ jobs:
         needs: git-metadata
         env:
           IMAGE_NAME: molvaapp/test_deploy
+          IMAGE_TAG: ${{ inputs.environment }}-${{ steps.git-metadata.outputs.GIT_TAG != 'none' && steps.git-metadata.outputs.GIT_TAG || steps.git-metadata.outputs.GIT_SHA }}
           CONFIG_FILE: .build/config/staging.yaml
         run: |
-          IMAGE_TAG=${{ inputs.environment }}-${{ steps.git-metadata.outputs.GIT_TAG != 'none' && steps.git-metadata.outputs.GIT_TAG || steps.git-metadata.outputs.GIT_SHA }}
-
           docker build \
             --build-arg BUILD_LDFLAGS="-w -s" \
             --build-arg CONFIG_FILE_PATH=$CONFIG_FILE \
@@ -81,6 +80,9 @@ jobs:
 
       - name: Deploy to Swarm
         env:
+          REGISTRY: hub.docker.com
+          REPO: ${{ github.repository }}
+
           DOCKER_HOST: tcp://${{ secrets.SWARM_MANAGER_HOST }}:2376
           DOCKER_TLS_VERIFY: 1
           DOCKER_CERT_PATH: /tmp/swarm-certs
@@ -88,7 +90,6 @@ jobs:
           VERSION: ${{ inputs.version == 'new' && 'latest' || inputs.version }}
 
           APP_COMMIT: ${{ steps.git-metadata.outputs.GIT_TAG != 'none' && steps.git-metadata.outputs.GIT_TAG || steps.git-metadata.outputs.GIT_SHA }}
-          APP_BUILD_DATE: ${{ date +"%Y-%m-%d %T %Z" }}
 
           KEYCLOAK_BASE_URL: ${{ secrets.KEYCLOAK_BASE_URL }}
           KEYCLOAK_REALM: ${{ secrets.KEYCLOAK_REALM }}
@@ -113,6 +114,11 @@ jobs:
 
           INTEGRATION_VKUSVILL_API_TOKEN: ${{ secrets.INTEGRATION_VKUSVILL_API_TOKEN }}
         run: |
+          REPO_NAME=$(echo $REPO | cut -d'/' -f2)
+
+          export APP_BUILD_DATE=$(wget -q -O - "https://$REGISTRY/v2/namespaces/molvaapp/repositories/$REPO_NAME/tags?page_size=100" | jq -r '.results[] | select(.name == $VERSION) | .tag_last_pushed')
+          echo "APP_BUILD_DATE=$APP_BUILD_DATE"
+
           envsubst < docker-compose.staging.yaml > docker-compose.runtime.yaml
 
           echo "Deploying version $VERSION to ${{ inputs.environment }}..."