diff --git a/Workbench/comanage/Dockerfile b/Workbench/comanage/Dockerfile
index e9a09c9..dc0d4a5 100644
--- a/Workbench/comanage/Dockerfile
+++ b/Workbench/comanage/Dockerfile
@@ -1,24 +1,21 @@
-FROM i2incommon/comanage-registry:3.3.1-20200930
+FROM i2incommon/comanage-registry:3.3.1-20201026
 
-ENV COMANAGE_REGISTRY_ADMIN_FAMILY_NAME=XXXXX
-ENV COMANAGE_REGISTRY_ADMIN_USERNAME=XXXX
+ENV COMANAGE_REGISTRY_ADMIN_FAMILY_NAME=Anderson
+ENV COMANAGE_REGISTRY_ADMIN_USERNAME=banderson
 ENV COMANAGE_REGISTRY_DATASOURCE=Database/Mysql
 ENV COMANAGE_REGISTRY_DATABASE=registry
-ENV COMANAGE_REGISTRY_DATABASE_HOST=grouper_data
-ENV COMANAGE_REGISTRY_DATABASE_USER=root
-ENV COMANAGE_REGISTRY_DATABASE_USER_PASSWORD=""
+ENV COMANAGE_REGISTRY_DATABASE_HOST=comanage-data
+ENV COMANAGE_REGISTRY_DATABASE_USER=registry_user
+ENV COMANAGE_REGISTRY_DATABASE_USER_PASSWORD=123321
 ENV COMANAGE_REGISTRY_EMAIL_FROM=xxxx@example.edu
 ENV COMANAGE_REGISTRY_EMAIL_TRANSPORT=Smtp
 ENV COMANAGE_REGISTRY_EMAIL_PORT=25
 ENV COMANAGE_REGISTRY_EMAIL_HOST=smtp.example.edu
+ENV HTTPS_CERT_FILE=/etc/pki/tls/certs/localhost.crt
+ENV HTTPS_PRIVKEY_FILE=/etc/pki/tls/private/localhost.key
+
 # COMANAGE_REGISTRY_SECURITY_SALT - autogenerated if not specified
 # COMANAGE_REGISTRY_SECURITY_SEED - autogenerated if not specified
-ENV HTTPS_CERT_FILE=/etc/pki/tls/certs/localhost.crt
-ENV HTTPS_KEY_FILE=/etc/pki/tls/private/localhost.key
-ENV MYSQL_ROOT_PASSWORD=xxxx
-ENV MYSQL_DATABASE=registry
-ENV MYSQL_USER=registry_user
-ENV MYSQL_PASSWORD_FILE=xxxx
 #ENV SHIBBOLETH_SP_CERT=/etc/shibboleth/sp-cert.pem
 #ENV SHIBBOLETH_SP_PRIVKEY=/etc/shibboleth/sp-key.pem
 #ENV SHIBBOLETH_SP_ENTITY_ID=comanage.example.edu
diff --git a/Workbench/comanage_data/Dockerfile b/Workbench/comanage_data/Dockerfile
index 23baa4c..6d0993a 100644
--- a/Workbench/comanage_data/Dockerfile
+++ b/Workbench/comanage_data/Dockerfile
@@ -1,8 +1,8 @@
 FROM tier/mariadb:mariadb10
 
 ENV MYSQL_DATABASE registry
-ENV MYSQL_USER root
-ENV MYSQL_PASSWORD password
+ENV MYSQL_USER registry_user
+ENV MYSQL_PASSWORD 123321
 ENV MYSQL_DATADIR /var/lib/mysqlmounted
 #ENV AFTER_FIRST_TIME_SQL /seed-data/persons-and-courses.sql
 
diff --git a/Workbench/docker-compose.yml b/Workbench/docker-compose.yml
index 611e0c3..86d464a 100644
--- a/Workbench/docker-compose.yml
+++ b/Workbench/docker-compose.yml
@@ -169,8 +169,6 @@ services:
      - 13306:3306
     networks:
      - net
-        aliases:
-         - comanage-data
     volumes:
      - source_mysql:/var/lib/mysql
      - source_data:/var/lib/mysqlmounted
@@ -182,14 +180,15 @@ services:
     ports:
      - 23306:3306
     networks:
-     - net
+      net:
+        aliases:
+         - comanage-data
     volumes:
      - comanage_mysql:/var/lib/mysql
      - comanage_data:/var/lib/mysqlmounted
     environment:
      - CREATE_NEW_DATABASE=if_needed
 
-
   midpoint_data:
     image: tier/mariadb:mariadb10
     ports:
@@ -331,6 +330,8 @@ secrets:
 volumes:
   grouper_data:
   source_data:
+  comanage_data:
+  comanage_mysql:
   source_mysql:
   target_data:
   ldap:
diff --git a/Workbench/webproxy/container_files/httpd/index.html b/Workbench/webproxy/container_files/httpd/index.html
index 3f18ede..43c3b17 100644
--- a/Workbench/webproxy/container_files/httpd/index.html
+++ b/Workbench/webproxy/container_files/httpd/index.html
@@ -12,7 +12,7 @@ <h3>Welcome to the InCommon TAP Workbench!</h3>
 <li><a href="https://__CSPHOSTNAME__/grouperSSO/Shibboleth.sso/Status" target="TAP-WB-SP">Shibboleth SP</a></li>
 <li><a href="https://__CSPHOSTNAME__/grouper" target="TAP-WB-GROUPER">Grouper</a></li>
 <li><a href="https://__CSPHOSTNAME__/midpoint" target="TAP-WB-MIDPOINT">midPoint</a></li>
-<li><a href="https://__CSPHOSTNAME__/comanage" target="TAP-WB-MIDPOINT">COmanage</a></li>
+<li><a href="https://__CSPHOSTNAME__/comanage" target="TAP-WB-COMANAGE">COmanage</a></li>
 </ul>
  In addition, the following applications are available:
 <ul>