diff --git a/.azure-pipelines/templates/release.yaml b/.azure-pipelines/templates/release.yaml
index 458585658..d1a5d2893 100644
--- a/.azure-pipelines/templates/release.yaml
+++ b/.azure-pipelines/templates/release.yaml
@@ -10,31 +10,28 @@ parameters:
     default: 'devfra'
 
 jobs:
-  - job: test
-    displayName: Release fradrive-test
-    condition: or(eq(variables.releaseTest, true), startsWith(variables['Build.SourceBranch'], 'refs/tags/'))
+  - job: Release
+    displayName: Release ${{ parameters.releaseTag }}
     container:
       image: devfra.azurecr.io/de.fraport.build/tools:1.1.0
       endpoint: devfra
     steps:
-      - checkout: self
+
+      # Download required artifacts from pipeline
       - task: DownloadPipelineArtifact@2
-        displayName: Download binaries
+        displayName: Download FraDrive binaries
         inputs:
           artifactName: backend
           patterns: 'backend/bin/*'
           targetPath: '$(Build.Repository.LocalPath)'
-      - script: |
-          ls -a .
-          pwd
-          find .
+
       - task: Docker@2
         displayName: Login to container registry
         inputs:
           command: login
           containerRegistry: '${{ parameters.releaseEndpoint }}'
       - task: Bash@3
-        displayName: Build container
+        displayName: Build FraDrive container
         inputs:
           targetType: inline
           script: |
@@ -47,6 +44,7 @@ jobs:
             --build-arg IN_CI=true \
             --build-arg IN_CONTAINER=true \
             .
+      # TODO: tag and push to registry
       - task: Docker@2
         displayName: Logout from container registry
         inputs: