diff --git a/azure-pipelines.yaml b/azure-pipelines.yaml
index 574c669e1..525ad7200 100644
--- a/azure-pipelines.yaml
+++ b/azure-pipelines.yaml
@@ -5,18 +5,7 @@
 pool: 'Prod Private Agent Pool'
 
 jobs:
-# - job: HelloWorld
-#   container:
-#     image: 'devfra.azurecr.io/de.fraport.trusted/ubuntu:22.04'
-#     endpoint: devfra
-#   steps:
-#   - script: echo Hello, world!
-#     displayName: 'Run a one-line script'
-#   - script: |
-#       echo Add other tasks to build, test, and deploy your project.
-#       echo See https://aka.ms/yaml
-#     displayName: 'Run a multi-line script'
-- job: DockerTaskTest
+- job: BuildImages
   container:
     image: devfra.azurecr.io/de.fraport.build/tools:1.1.0
     endpoint: devfra
@@ -28,40 +17,21 @@ jobs:
         command: login
         containerRegistry: devFra
     - task: Docker@2
-      name: dockerBuild
+      name: dockerBuildAndPush
       displayName: Backend image build test
       inputs:
-        command: build
-        Dockerfile: docker/backend/Dockerfile
+        command: buildAndPush
+        Dockerfile: docker/haskell/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 PROJECT_DIR=/fradrive
-          --build-arg MOUNT_DIR=/mnt/fradrive
-# - job: BuildKitTest
-#   container:
-#     image: 'devfra.azurecr.io/de.fraport.trusted/buildkit:0.12.1'
-#     endpoint: devfra
-#   steps:
-#     - script: buildctl build \
-#         --frontend=dockerfile.v0 \
-#         --local context=. \
-#         --local dockerfile=docker/backend/Dockerfile
-#       displayName: BuildKit test
-# - job: CustomBuildahTest
-#   container:
-#     image: 'devfra.azurecr.io/de.fraport.trusted/ubuntu:22.04'
-#     endpoint: devfra
-#   steps:
-#     - script: |
-#         id
-#         docker build --help
-#         sudo apt-get -y update
-#         sudo apt-get -y install buildah
-#         buildah bud -t fradrive-backend-test --volume .:/mnt/fradrive --file docker/backend/Dockerfile
-#       displayName: Build buildah image
\ No newline at end of file
+    - task: Docker@2
+      name: dockerLogoutDevFra
+      displayName: Docker Logout from devfra
+      inputs:
+        command: logout
+        containerRegistry: devFra
\ No newline at end of file