diff --git a/Dockerfile b/Dockerfile
index f3ae542..71bd612 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -18,7 +18,8 @@ LABEL Build docker build --rm --tag $maintainer/$imagename .
 # Install base deps
 RUN yum -y install --setopt=tsflags=nodocs epel-release && \
     yum -y install net-tools wget curl tar unzip mlocate logrotate strace telnet man unzip vim wget rsyslog cron && \
-    yum clean all
+    yum clean all && \
+    mkdir -p /opt/tier
 
 # Install Trusted Certificates
 RUN update-ca-trust force-enable
@@ -26,10 +27,10 @@ ADD ./cert/InCommon.crt /etc/pki/ca-trust/source/anchors/
 RUN update-ca-trust extract
 
 # Set default environment variables.
-ENV HOME /root
+ENV HOME /opt/tier
 
 # Allow triggerable events on the first time running
 RUN touch /tmp/firsttimerunning
 
 # Define working directory.
-WORKDIR /root
+WORKDIR /opt/tier