diff --git a/.gitea/workflows/deploy_staging.yaml b/.gitea/workflows/deploy_staging.yaml
index 560cc15..52bca70 100644
--- a/.gitea/workflows/deploy_staging.yaml
+++ b/.gitea/workflows/deploy_staging.yaml
@@ -38,8 +38,17 @@ jobs:
         env:
           REPO: ${{ github.repository }}
         run: |
-          echo "GIT_SHA=$(git rev-parse --short HEAD)" >> $GITHUB_OUTPUT
-          echo "GIT_TAG=$(git describe --tags --abbrev=0 2>/dev/null || echo 'none')" >> $GITHUB_OUTPUT
+          if [ ${{ inputs.version }} == "new" ]; then
+            GIT_SHA=$(git rev-parse --short HEAD)
+            GIT_TAG=$(git describe --tags --abbrev=0 2>/dev/null || echo 'none')
+          else
+            GIT_SHA=$(echo ${{ inputs.version }} | cut -d'-' -f2)
+            GIT_TAG='none'
+          fi
+
+          echo "GIT_SHA=${GIT_SHA}" >> $GITHUB_OUTPUT
+          echo "GIT_TAG=${GIT_TAG}" >> $GITHUB_OUTPUT
+          echo "APP_COMMIT=$($GIT_TAG != 'none' && $GIT_TAG || $GIT_SHA)" >> $GITHUB_OUTPUT
           echo "REPO_OWNER=$(echo $REPO | cut -d'/' -f1)" >> $GITHUB_OUTPUT
           echo "REPO_NAME=$(echo $REPO | cut -d'/' -f2)" >> $GITHUB_OUTPUT
 
@@ -120,7 +129,8 @@ 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_VERSION: ${{ inputs.environment }}-${{ steps.git-metadata.outputs.APP_COMMIT }}
+          APP_COMMIT: ${{ steps.git-metadata.outputs.APP_COMMIT }}
           APP_BUILD_DATE: ${{ steps.docker-metadata.outputs.TAG_LAST_PUSHED }}
 
           KEYCLOAK_BASE_URL: ${{ secrets.KEYCLOAK_BASE_URL }}
diff --git a/docker-compose.staging.yaml b/docker-compose.staging.yaml
index f7b63c0..2781c6d 100644
--- a/docker-compose.staging.yaml
+++ b/docker-compose.staging.yaml
@@ -8,7 +8,7 @@ services:
         published: 8001
         protocol: tcp
     environment:
-      APP_VERSION: ${VERSION}
+      APP_VERSION: ${APP_VERSION}
       APP_COMMIT: ${APP_COMMIT}
       APP_BUILD_DATE: ${APP_BUILD_DATE}