diff --git a/.pipeline/frontend/blubber.yaml b/.pipeline/frontend/blubber.yaml
index 08c73271d..5b28f13cf 100644
--- a/.pipeline/frontend/blubber.yaml
+++ b/.pipeline/frontend/blubber.yaml
@@ -1,89 +1,89 @@
 # syntax=docker-registry.wikimedia.org/repos/releng/blubber:v0.17.0
 version: v4
 base: docker-registry.wikimedia.org/openjdk-11-jdk
 
 lives:
   in: /datahub-frontend
 
 variants:
   datahub-source:
     lives:
       in: /datahub
     base: docker-registry.wikimedia.org/bullseye:latest
     apt:
       packages: [ 'git', 'ca-certificates' ]
     builders:
       - custom:
           command:
             - git
             - clone
             - '--branch'
             - 'v0.10.4'
             - '--single-branch'
             - "https://github.com/datahub-project/datahub.git"
             - "/datahub"
       - custom:
           command:
             - chmod
             - +x
             - /datahub/docker/datahub-frontend/start.sh
   build:
     lives:
       in: /datahub
     apt: { packages: [python3] }
     builder:
       command: ['./gradlew', ':datahub-frontend:dist', '-PuseSystemNode=false', '-x', 'test', '-x', 'yarnTest', '-x', 'yarnLint']
       requirements:
         - from: datahub-source
           source: /datahub
           destination: /datahub
 
   extract:
     lives:
-      in: /datahub-frontend
+      in: /datahub
     apt: { packages: [unzip] }
     builder:
-      command: ['unzip', '/tmp/datahub-frontend.zip', '-d', '/datahub-frontend']
+      command: ['unzip', 'datahub-frontend.zip']
       requirements:
         - from: build
           source: /datahub/datahub-frontend/build/distributions/datahub-frontend-*.zip
-          destination: /tmp/datahub-frontend.zip
+          destination: /datahub/datahub-frontend.zip
 
   prepare:
     apt: { packages: [unzip, wget] }
     lives:
-      in: /datahub-frontend
+      in: /datahub
     builders:
       - custom:
           command: [ 'wget', '--no-verbose' ,'https://github.com/open-telemetry/opentelemetry-java-instrumentation/releases/download/v1.24.0/opentelemetry-javaagent.jar', '-O', '/tmp/opentelemetry-javaagent.jar']
       - custom:
           command: [ 'wget', '--no-verbose' ,'https://repo1.maven.org/maven2/io/prometheus/jmx/jmx_prometheus_javaagent/0.18.0/jmx_prometheus_javaagent-0.18.0.jar', '-O', '/tmp/jmx_prometheus_javaagent.jar']
  
   production:
     runs:
       environment:
         SERVER_PORT: '9002'
     apt:
       sources:
         - url: http://apt.wikimedia.org/wikimedia
           distribution: bullseye-wikimedia
           components: [main]
       packages: [ wmf-certificates ]
     copies:
       - from: extract
-        source: /datahub-frontend
+        source: /datahub/datahub-frontend
         destination: /datahub-frontend
       - from: build
         source: /datahub/docker/datahub-frontend/start.sh
         destination: /
       - from: build
         source: /datahub/docker/monitoring/client-prometheus-config.yaml
         destination: /datahub-frontend
       - from: prepare
         source: /tmp/opentelemetry-javaagent.jar
         destination: /
       - from: prepare
         source: /tmp/jmx_prometheus_javaagent.jar
         destination: /
-    entrypoint: ['/start.sh']
+    entrypoint: [ '/bin/sh', '-c', 'cd / && /start.sh']