diff --git a/Dockerfile.compile b/Dockerfile.compile
index 595cdafb791..7ba8d8a6b2a 100644
--- a/Dockerfile.compile
+++ b/Dockerfile.compile
@@ -3,7 +3,7 @@ RUN apt-get update && apt-get install -y \
     openjdk-8-jdk \
     openjdk-11-jdk \
  && rm -rf /var/lib/apt/lists/*
-MAINTAINER sig-platform@spinnaker.io
+LABEL maintainer="sig-platform@spinnaker.io"
 ENV JAVA_HOME /usr/lib/jvm/java-11-openjdk-amd64
 ENV JDK_18 /usr/lib/jvm/java-8-openjdk-amd64
 ENV GRADLE_USER_HOME /workspace/.gradle
diff --git a/Dockerfile.java8 b/Dockerfile.java8
deleted file mode 100644
index 03d88a9b232..00000000000
--- a/Dockerfile.java8
+++ /dev/null
@@ -1,8 +0,0 @@
-FROM alpine:3.11
-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
-RUN mkdir -p /opt/orca/plugins && chown -R spinnaker:nogroup /opt/orca/plugins
-USER spinnaker
-CMD ["/opt/orca/bin/orca"]
diff --git a/Dockerfile.slim b/Dockerfile.slim
index 35b24d3c0c0..8cf7e4b1364 100644
--- a/Dockerfile.slim
+++ b/Dockerfile.slim
@@ -1,8 +1,9 @@
 FROM alpine:3.11
-MAINTAINER sig-platform@spinnaker.io
-COPY orca-web/build/install/orca /opt/orca
+LABEL maintainer="sig-platform@spinnaker.io"
 RUN apk --no-cache add --update bash openjdk11-jre
-RUN adduser -D -S spinnaker
+RUN addgroup -S -g 10111 spinnaker
+RUN adduser -S -G spinnaker -u 10111 spinnaker
+COPY orca-web/build/install/orca /opt/orca
 RUN mkdir -p /opt/orca/plugins && chown -R spinnaker:nogroup /opt/orca/plugins
 USER spinnaker
 CMD ["/opt/orca/bin/orca"]
diff --git a/Dockerfile.ubuntu b/Dockerfile.ubuntu
index df24c78e110..16dfa491983 100644
--- a/Dockerfile.ubuntu
+++ b/Dockerfile.ubuntu
@@ -1,8 +1,8 @@
 FROM ubuntu:bionic
-MAINTAINER sig-platform@spinnaker.io
-COPY orca-web/build/install/orca /opt/orca
+LABEL maintainer="sig-platform@spinnaker.io"
 RUN apt-get update && apt-get -y install openjdk-11-jre-headless wget
-RUN adduser --disabled-login --system spinnaker
+RUN adduser --system --uid 10111 --group spinnaker
+COPY orca-web/build/install/orca /opt/orca
 RUN mkdir -p /opt/orca/plugins && chown -R spinnaker:nogroup /opt/orca/plugins
 USER spinnaker
 CMD ["/opt/orca/bin/orca"]
diff --git a/Dockerfile.ubuntu-java8 b/Dockerfile.ubuntu-java8
deleted file mode 100644
index b5597532c83..00000000000
--- a/Dockerfile.ubuntu-java8
+++ /dev/null
@@ -1,8 +0,0 @@
-FROM ubuntu:bionic
-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
-RUN mkdir -p /opt/orca/plugins && chown -R spinnaker:nogroup /opt/orca/plugins
-USER spinnaker
-CMD ["/opt/orca/bin/orca"]