diff --git a/backend/Dockerfile b/backend/Dockerfile
index c1278d7302..042a94aae6 100644
--- a/backend/Dockerfile
+++ b/backend/Dockerfile
@@ -1,3 +1,13 @@
+ARG base_image=debian:buster
+
+### Scaffolder Stage
+### needs extra cookiecutter
+FROM debian:buster AS scaffolder
+RUN apt-get update && apt-get install -y python-pip
+RUN apt-get install -y python-backports.functools-lru-cache
+RUN pip install cookiecutter==1.7.0 --index-url https://pypi.python.org/simple
+
+
 ### Builder Stage
 FROM golang:1.13 AS build
 ARG service
@@ -16,7 +26,7 @@ RUN go build .
 
 
 ### Running Container Stage
-FROM debian:buster AS default
+FROM ${base_image}
 ARG service
 
 RUN apt-get update && apt-get install -y ca-certificates
@@ -26,11 +36,3 @@ WORKDIR /app/
 COPY --from=build /build/$service/$service /app/service
 
 CMD ["./service"]
-
-
-### Scaffolder Stage
-### needs extra cookiecutter
-FROM default AS scaffolder
-RUN apt-get update && apt-get install -y python-pip
-RUN apt-get install -y python-backports.functools-lru-cache
-RUN pip install cookiecutter==1.7.0 --index-url https://pypi.python.org/simple
diff --git a/docker-compose.yaml b/docker-compose.yaml
index b917b64aeb..239e0aaf85 100755
--- a/docker-compose.yaml
+++ b/docker-compose.yaml
@@ -15,7 +15,6 @@ services:
     container_name: boss-identity
     build:
       context: backend
-      target: default
       args:
         service: identity
     restart: unless-stopped
@@ -34,7 +33,6 @@ services:
     container_name: boss-builds
     build:
       context: backend
-      target: default
       args:
         service: builds
     restart: unless-stopped
@@ -45,12 +43,11 @@ services:
       - inventory
     links:
       - inventory
-    container_name: boss-scaffolder
     build:
       context: backend
-      target: scaffolder
       args:
         service: scaffolder
+        base_image: scaffolder
     restart: unless-stopped
     volumes:
       - ./backend/scaffolder/templates:/app/templates:ro