diff --git a/Dockerfile.compile b/Dockerfile.compile
index 3ae8e56bed..1d57b167c5 100644
--- a/Dockerfile.compile
+++ b/Dockerfile.compile
@@ -1,6 +1,12 @@
-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 orca-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 orca-web:installDist -x test
diff --git a/Dockerfile.slim b/Dockerfile.slim
index 2dc8d6d652..bc2ddc3674 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/orca-web/build/install/orca /opt/orca
+MAINTAINER sig-platform@spinnaker.io
+COPY orca-web/build/install/orca /opt/orca
 RUN apk --no-cache add --update bash openjdk8-jre
 RUN adduser -D -S spinnaker
 USER spinnaker
diff --git a/Dockerfile.ubuntu b/Dockerfile.ubuntu
index de9cf0ddd9..485bdf827a 100644
--- a/Dockerfile.ubuntu
+++ b/Dockerfile.ubuntu
@@ -1,7 +1,7 @@
 FROM ubuntu:bionic
-MAINTAINER delivery-engineering@netflix.com
-COPY --from=compile /compiled_sources/orca-web/build/install/orca /opt/orca
+MAINTAINER sig-platform@spinnaker.io
+COPY orca-web/build/install/orca /opt/orca
 RUN apt-get update && apt-get -y install openjdk-8-jre-headless wget
 RUN adduser --disabled-login --system spinnaker
 USER spinnaker
-CMD ["/opt/orca/bin/orca"]
\ No newline at end of file
+CMD ["/opt/orca/bin/orca"]