diff --git a/Dockerfile.java8 b/Dockerfile.java8
index 08ab2150ad..94c2efcce0 100644
--- a/Dockerfile.java8
+++ b/Dockerfile.java8
@@ -3,5 +3,6 @@ MAINTAINER sig-platform@spinnaker.io
 COPY gate-web/build/install/gate /opt/gate
 RUN apk --no-cache add --update bash openjdk8-jre
 RUN adduser -D -S spinnaker
+RUN mkdir -p /opt/spinnaker/plugins && chown -R spinnaker:nogroup /opt/spinnaker/plugins
 USER spinnaker
 CMD ["/opt/gate/bin/gate"]
diff --git a/Dockerfile.slim b/Dockerfile.slim
index 7a3ff87cd1..9fd049b4e6 100644
--- a/Dockerfile.slim
+++ b/Dockerfile.slim
@@ -3,6 +3,6 @@ MAINTAINER sig-platform@spinnaker.io
 COPY gate-web/build/install/gate /opt/gate
 RUN apk --no-cache add --update bash openjdk11-jre
 RUN adduser -D -S spinnaker
-RUN mkdir plugins && chown -R 100:100 plugins
+RUN mkdir -p /opt/spinnaker/plugins && chown -R spinnaker:nogroup /opt/spinnaker/plugins
 USER spinnaker
 CMD ["/opt/gate/bin/gate"]
diff --git a/Dockerfile.ubuntu b/Dockerfile.ubuntu
index e14754051e..bfe5e2126d 100644
--- a/Dockerfile.ubuntu
+++ b/Dockerfile.ubuntu
@@ -3,6 +3,6 @@ MAINTAINER sig-platform@spinnaker.io
 COPY gate-web/build/install/gate /opt/gate
 RUN apt-get update && apt-get -y install openjdk-11-jre-headless wget
 RUN adduser --disabled-login --system spinnaker
-RUN mkdir plugins && chown -R 102:nogroup plugins
+RUN mkdir -p /opt/spinnaker/plugins && chown -R spinnaker:nogroup /opt/spinnaker/plugins
 USER spinnaker
 CMD ["/opt/gate/bin/gate"]
diff --git a/Dockerfile.ubuntu-java8 b/Dockerfile.ubuntu-java8
index b09054dd6f..396ea188c2 100644
--- a/Dockerfile.ubuntu-java8
+++ b/Dockerfile.ubuntu-java8
@@ -3,6 +3,6 @@ MAINTAINER sig-platform@spinnaker.io
 COPY gate-web/build/install/gate /opt/gate
 RUN apt-get update && apt-get -y install openjdk-8-jre-headless wget
 RUN adduser --disabled-login --system spinnaker
-RUN mkdir plugins && chown -R 102:nogroup plugins
+RUN mkdir -p /opt/spinnaker/plugins && chown -R spinnaker:nogroup /opt/spinnaker/plugins
 USER spinnaker
 CMD ["/opt/gate/bin/gate"]