diff --git a/docker_build/Dockerfile.rhel8-ubi8 b/docker_build/Dockerfile.rhel8-ubi8
index 72cfe5542d..955f2c70ec 100644
--- a/docker_build/Dockerfile.rhel8-ubi8
+++ b/docker_build/Dockerfile.rhel8-ubi8
@@ -3,7 +3,7 @@ MAINTAINER OpsMx
 # Add user opsmx and create logs and spinnaker config directory
 RUN adduser opsmx \
     && usermod -aG wheel opsmx \
-    && mkdir /home/opsmx/logs \
+    && mkdir -p /opsmx/workdir/logs \
     && mkdir -p /opt/spinnaker/config
 
 # Install procps(ps)
@@ -13,17 +13,17 @@ RUN yum install -y java-1.8.0-openjdk.x86_64
 # Install ping
 RUN yum install -y iputils
 #######Gate Dependencies#########
-ENV WORK_DIR=/home/opsmx
+ENV WORK_DIR=/opsmx/workdir
 ENV JAVA_HOME=/usr/lib/jvm/jre-1.8.0-openjdk
 COPY /docker_build/run.sh /usr/local/bin/run.sh
 RUN  chmod +x /usr/local/bin/run.sh
 COPY /docker_build/gate.yml /opt/spinnaker/config/
-COPY /docker_build/startup.sh /home/opsmx/
-RUN  chmod +x /home/opsmx/startup.sh
+COPY /docker_build/startup.sh /opsmx/workdir/
+RUN  chmod +x /opsmx/workdir/startup.sh
 
 # === Copy Gate Build Files ===
-COPY /gate-web/build/install/gate  /home/opsmx/gate
-RUN chown -R opsmx:root ${WORK_DIR}/* /opt/*
+COPY /gate-web/build/install/gate  /opsmx/workdir/gate
+RUN chown -R opsmx:root ${WORK_DIR}/* /opt/* && chmod 777 /opt/* ${WORK_DIR}/*
 
 # === Start Gate Service ===
 USER opsmx