diff --git a/Dockerfile b/Dockerfile
index dadee78..ee2c5d8 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -90,9 +90,9 @@ RUN mkdir /opt/shared \
     && chmod +x /opt/autoexec/onbuild/*.sh
 
 # Environment variables
-ENV ADMIN_NAME "Scott"
-ENV ADMIN_FAMILY "Koranda"
-ENV ADMIN_USERNAME "scott.koranda@sphericalcowgroup.com"
+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"
 ENV COMANAGE_MAIL_HOST "localhost"