diff --git a/Dockerfile.compile b/Dockerfile.compile
index 7f15ce76e3c..f79cbc10757 100644
--- a/Dockerfile.compile
+++ b/Dockerfile.compile
@@ -1,8 +1,5 @@
-FROM gcr.io/spinnaker-marketplace/gradle_cache
-MAINTAINER delivery-engineering@netflix.com
-
-ENV GRADLE_USER_HOME /gradle_cache/.gradle
-COPY . compiled_sources
-WORKDIR compiled_sources
-
-RUN ./gradlew build --no-daemon -PskipTests
+FROM openjdk:8
+MAINTAINER sig-platform@spinnaker.io
+ENV GRADLE_USER_HOME /workspace/.gradle
+ENV GRADLE_OPTS -Xmx2048m
+CMD ./gradlew build --no-daemon -PskipTests
diff --git a/Dockerfile.slim b/Dockerfile.slim
index 5a5c5e49ecf..f8ea4fe409d 100644
--- a/Dockerfile.slim
+++ b/Dockerfile.slim
@@ -1,7 +1,8 @@
 FROM debian:stable-slim
-MAINTAINER delivery-engineering@netflix.com
-COPY --from=compile /compiled_sources/build/webpack /opt/deck/html
-COPY --from=compile /compiled_sources/docker        /opt/deck/docker
+MAINTAINER sig-platform@spinnaker.io
+
+COPY build/webpack /opt/deck/html
+COPY docker        /opt/deck/docker
 WORKDIR /opt/deck
 
 RUN docker/setup-apache2.sh
diff --git a/Dockerfile.ubuntu b/Dockerfile.ubuntu
index 11be6d7cfc3..6bd4b2b0fff 100644
--- a/Dockerfile.ubuntu
+++ b/Dockerfile.ubuntu
@@ -1,7 +1,8 @@
 FROM ubuntu:bionic
-MAINTAINER delivery-engineering@netflix.com
-COPY --from=compile /compiled_sources/build/webpack /opt/deck/html
-COPY --from=compile /compiled_sources/docker        /opt/deck/docker
+MAINTAINER sig-platform@spinnaker.io
+
+COPY build/webpack /opt/deck/html
+COPY docker        /opt/deck/docker
 WORKDIR /opt/deck
 
 RUN docker/setup-apache2.sh