diff --git a/azure-pipelines.yaml b/azure-pipelines.yaml
index 06beee692..74665cb30 100644
--- a/azure-pipelines.yaml
+++ b/azure-pipelines.yaml
@@ -17,6 +17,24 @@ jobs:
       inputs:
         command: login
         containerRegistry: devFra
+    - task: Docker@2
+      name: dockerBuildFrontend
+      displayName: Docker build frontend image
+      inputs:
+        command: build
+        Dockerfile: docker/frontend/Dockerfile
+        buildContext: .
+        tags: |
+          $(Build.BuildNumber)
+          frontend
+        arguments: |
+          --build-arg FROM_IMG=devfra.azurecr.io/de.fraport.build/npm \
+          --build-arg FROM_TAG=node-20 \
+          --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 MOUNT_DIR=$(Build.Repository.LocalPath) \
+          --build-arg PROJECT_DIR=/fradrive \
     - task: Bash@3
       displayName: Build backend image
       inputs:
@@ -24,10 +42,10 @@ jobs:
         script: |
           cp docker/backend/Dockerfile .
           docker build \
+          --build-arg FROM_IMG=devfra.azurecr.io/de.fraport.build/haskell \
           --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 \
           .