diff --git a/Dockerfile.compile b/Dockerfile.compile
index c80046722..8e8db4614 100644
--- a/Dockerfile.compile
+++ b/Dockerfile.compile
@@ -1,6 +1,8 @@
-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 --no-daemon fiat-web:installDist -x test
\ No newline at end of file
+FROM ubuntu:eoan
+MAINTAINER sig-platform@spinnaker.io
+
+RUN apt-get update && apt-get -y upgrade && apt-get install -y openjdk-8-jdk-headless && apt-get clean
+
+ENV GRADLE_USER_HOME /workspace/.gradle
+ENV GRADLE_OPTS -Xmx2048m
+CMD ./gradlew --no-daemon fiat-web:installDist -x test
diff --git a/Dockerfile.java8 b/Dockerfile.java8
index d618a6660..707e6de21 100644
--- a/Dockerfile.java8
+++ b/Dockerfile.java8
@@ -1,6 +1,6 @@
 FROM alpine:3.11
 MAINTAINER delivery-engineering@netflix.com
-COPY --from=compile /compiled_sources/fiat-web/build/install/fiat /opt/fiat
+COPY fiat-web/build/install/fiat /opt/fiat
 RUN apk --no-cache add --update bash openjdk8-jre
 RUN adduser -D -S spinnaker
 USER spinnaker
diff --git a/Dockerfile.slim b/Dockerfile.slim
index 2ab7fe17f..0ef1ceaa4 100644
--- a/Dockerfile.slim
+++ b/Dockerfile.slim
@@ -1,6 +1,6 @@
 FROM alpine:3.11
 MAINTAINER delivery-engineering@netflix.com
-COPY --from=compile /compiled_sources/fiat-web/build/install/fiat /opt/fiat
+COPY fiat-web/build/install/fiat /opt/fiat
 RUN apk --no-cache add --update bash openjdk11-jre
 RUN adduser -D -S spinnaker
 USER spinnaker
diff --git a/Dockerfile.ubuntu b/Dockerfile.ubuntu
index a619fbf66..41566f68b 100644
--- a/Dockerfile.ubuntu
+++ b/Dockerfile.ubuntu
@@ -1,7 +1,7 @@
 FROM ubuntu:bionic
 MAINTAINER delivery-engineering@netflix.com
-COPY --from=compile /compiled_sources/fiat-web/build/install/fiat /opt/fiat
+COPY fiat-web/build/install/fiat /opt/fiat
 RUN apt-get update && apt-get -y install openjdk-11-jre-headless wget
 RUN adduser --disabled-login --system spinnaker
 USER spinnaker
-CMD ["/opt/fiat/bin/fiat"]
\ No newline at end of file
+CMD ["/opt/fiat/bin/fiat"]
diff --git a/Dockerfile.ubuntu-java8 b/Dockerfile.ubuntu-java8
index 37b5ffe4d..b31f5b1df 100644
--- a/Dockerfile.ubuntu-java8
+++ b/Dockerfile.ubuntu-java8
@@ -1,7 +1,7 @@
 FROM ubuntu:bionic
 MAINTAINER delivery-engineering@netflix.com
-COPY --from=compile /compiled_sources/fiat-web/build/install/fiat /opt/fiat
+COPY fiat-web/build/install/fiat /opt/fiat
 RUN apt-get update && apt-get -y install openjdk-8-jre-headless wget
 RUN adduser --disabled-login --system spinnaker
 USER spinnaker
-CMD ["/opt/fiat/bin/fiat"]
\ No newline at end of file
+CMD ["/opt/fiat/bin/fiat"]