diff --git a/Dockerfile b/Dockerfile
index 3e2e8f3..ffd5989 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -19,8 +19,8 @@ FROM tier/shibboleth_sp
 ARG registry=docker.io
 ARG maintainer=tier
 ARG imagename=comanage
-ARG version=1.0.6
-ARG tierversion=17020
+ARG version=2.0.0-rc2
+ARG tierversion=17030
 
 MAINTAINER $maintainer
 LABEL Vendor="Internet2"
@@ -96,12 +96,14 @@ RUN mkdir /opt/shared \
     && chmod +x /opt/autoexec/firstrun/*.sh \
     && chmod +x /opt/autoexec/onbuild/*.sh
 
-# Environment variables
-ENV ADMIN_GIVEN_NAME "Scott"
-ENV ADMIN_FAMILY_NAME "Koranda"
-ENV ADMIN_EPPN "scott.koranda@sphericalcowgroup.com"
-ENV COMANAGE_SERVER_FQDN "comanage.testbed.tier.internet2.edu"
-ENV COMANAGE_MAIL_FROM "comanage_registry@picard.cgac.uwm.edu"
+# Change the following values to match that of your deployment when doing a native COmanage Docker deployment.
+# If using the TIER COmanage Virtual Machine (https://testbed.tier.internet2.edu/), these values will be configured
+# with the setup script
+ENV ADMIN_GIVEN_NAME "Admin"
+ENV ADMIN_FAMILY_NAME "Adming"
+ENV ADMIN_EPPN "admin@example.edu"
+ENV COMANAGE_SERVER_FQDN "comanage.example.edu"
+ENV COMANAGE_MAIL_FROM "comanage_registry@comanage.example.edu"
 ENV COMANAGE_MAIL_HOST "localhost"
 ENV COMANAGE_MAIL_PORT "25"
 ENV COMANAGE_MAIL_USER "user"
@@ -109,9 +111,8 @@ ENV COMANAGE_MAIL_PASS "secret"
 ENV MYSQL_HOST "i2mariadb"
 ENV MYSQL_DATABASE "registry"
 ENV MYSQL_USER "registry_user"
-ENV MYSQL_PASSWORD "WJzesbe3poNZ91qIbmR7"
+ENV MYSQL_PASSWORD "mysql_password"
 ENV ADMIN_FAMILY_NAME "admin"
-ENV ADMIN_EPPN "admin"
 ENV ADMIN_GIVEN_NAME "admin"
 
 # How long will we wait for MariaDB to start up?
@@ -134,7 +135,7 @@ RUN ln -s /opt/etc/httpd/conf.d/ports.conf /etc/httpd/conf.d/ports.conf &&  \
     ln -s /opt/etc/php/email.php  /opt/comanage/comanage-registry-$version/local/Config/email.php && \
     rm -f /opt/comanage/comanage-registry-$version/app/Config/email.php && \
     ln -s /opt/etc/php/email.php  /opt/comanage/comanage-registry-$version/app/Config/email.php && \
-    ln -s /opt/comanage/comanage-registry-1.0.6/app/webroot /var/www/html/registry && \
+    ln -s /opt/comanage/comanage-registry-$VERSION/app/webroot /var/www/html/registry && \
     rm /etc/httpd/conf/httpd.conf && \
     ln -s /opt/etc/httpd/conf/httpd.conf /etc/httpd/conf/httpd.conf && \
     /opt/autoexec/bin/onbuild.sh
diff --git a/common.bash b/common.bash
index 29d2ecb..f499026 100644
--- a/common.bash
+++ b/common.bash
@@ -15,4 +15,4 @@
 #
 maintainer="bigfleet"
 imagename="comanage"
-version="1.0.6"
+version="2.0.0-rc2"