diff --git a/azure-pipelines.yaml b/azure-pipelines.yaml
index d4f8dea5e..072eb9348 100644
--- a/azure-pipelines.yaml
+++ b/azure-pipelines.yaml
@@ -5,7 +5,7 @@
 pool: 'Prod Private Agent Pool'
 
 jobs:
-- job: BuildImages
+- job: BuildFrontendImage
   container:
     image: devfra.azurecr.io/de.fraport.build/tools:1.1.0
     endpoint: devfra
@@ -35,6 +35,25 @@ jobs:
           --tag $(Build.BuildNumber) \
           --tag frontend \
           .
+    - task: Docker@2
+      name: dockerLogoutDevFra
+      displayName: Docker Logout from devfra
+      inputs:
+        command: logout
+        containerRegistry: devFra
+
+- job: BuildBackendImage
+  container:
+    image: devfra.azurecr.io/de.fraport.build/tools:1.1.0
+    endpoint: devfra
+  steps:
+    - checkout: self
+    - task: Docker@2
+      name: dockerLoginDevFra
+      displayName: Docker Login to devfra
+      inputs:
+        command: login
+        containerRegistry: devFra
     - task: Bash@3
       displayName: Build backend image
       inputs:
@@ -51,24 +70,6 @@ jobs:
           --tag $(Build.BuildNumber) \
           --tag backend \
           .
-    # - task: Docker@2
-    #   name: dockerBuild
-    #   displayName: Backend image build test
-    #   inputs:
-    #     command: build
-    #     Dockerfile: docker/backend/Dockerfile
-    #     buildContext: .
-    #     tags: |
-    #       $(Build.BuildNumber)
-    #       backend
-    #     arguments: |
-    #       --build-arg HTTPS_PROXY=http://proxy.frankfurt-airport.de:8080
-    #       --build-arg HTTP_PROXY=http://proxy.frankfurt-airport.de:8080
-    #       --build-arg NO_PROXY='localhost,127.0.0.1,*.docker.internal,*.azmk8s.io,devfra.azurecr.io,devfra.westeurope.data.azurecr.io'
-    #       --build-arg FROM_IMG=devfra.azurecr.io/de.fraport.build/haskell
-    #       --build-arg MOUNT_DIR=$(Build.Repository.LocalPath)
-    #       --build-arg PROJECT_DIR=/fradrive
-    #     # -v $(Build.Repository.LocalPath):/mnt/fradrive # supported in podman build, but not in docker build
     - task: Docker@2
       name: dockerLogoutDevFra
       displayName: Docker Logout from devfra