diff --git a/Dockerfile b/Dockerfile
index da44a1a..aeeb77b 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,20 +1,31 @@
-FROM centos:7
+FROM centos/python-36-centos7
 
 MAINTAINER RightBrain Networks "ops+docker@rightbrainnetworks.com"
 
-RUN yum update -y && yum install -y epel-release
+USER root
 
+#Perform updates
+RUN pip install --upgrade pip
+RUN yum update -y
+
+#Install reqs
+RUN yum install -y epel-release
 RUN yum install -y git
 
-RUN yum install -y python-pip
-RUN pip install --upgrade pip
-
-RUN useradd -d /semver semver
+#Setup semver
+ADD / /semver
 WORKDIR /semver
-
-ADD ./ /semver
-RUN chmod -R +r /semver && chmod +x /semver
-
 RUN pip install -e .
 
-CMD semver && semver_get_version
+# Prep workspace
+RUN mkdir /workspace
+WORKDIR /workspace
+VOLUME /workspace
+
+#Permissions
+RUN useradd -d /semverUser semverUser
+RUN chown -R semverUser:semverUser /workspace
+
+CMD /opt/app-root/bin/semver
+
+USER semverUser
\ No newline at end of file