diff --git a/backend/Dockerfile b/backend/Dockerfile
index 356b5e524..032093011 100644
--- a/backend/Dockerfile
+++ b/backend/Dockerfile
@@ -17,7 +17,8 @@ COPY internal internal
 ARG SERVICE_NAME
 RUN CGO_ENABLED=1 GOOS=linux GOARCH=amd64 go build -o service -tags musl openreplay/backend/cmd/$SERVICE_NAME
 
-FROM alpine
+
+FROM alpine AS entrypoint
 RUN apk add --no-cache ca-certificates
 
 ENV TZ=UTC \
diff --git a/backend/Dockerfile.bundle b/backend/Dockerfile.bundle
index 79ef57db5..100b646c8 100644
--- a/backend/Dockerfile.bundle
+++ b/backend/Dockerfile.bundle
@@ -10,13 +10,13 @@ RUN go mod download
 
 
 FROM prepare AS build
+COPY cmd cmd
 COPY pkg pkg
-COPY services services
+COPY internal internal
 
-RUN for name in assets db ender http integrations sink storage;do CGO_ENABLED=1 GOOS=linux GOARCH=amd64 go build -o bin/$name -tags musl openreplay/backend/services/$name; done
+RUN for name in assets db ender http integrations sink storage;do CGO_ENABLED=1 GOOS=linux GOARCH=amd64 go build -o bin/$name -tags musl openreplay/backend/cmd/$name; done
 
-
-FROM alpine
+FROM alpine AS entrypoint
 #FROM pygmy/alpine-tini:latest
 RUN apk add --no-cache ca-certificates