diff --git a/compose/README.md b/comanage-registry-stack/README.md
similarity index 100%
rename from compose/README.md
rename to comanage-registry-stack/README.md
diff --git a/comanage-registry-stack/comanage-registry-stack.yml b/comanage-registry-stack/comanage-registry-stack.yml
new file mode 100644
index 0000000..00d29db
--- /dev/null
+++ b/comanage-registry-stack/comanage-registry-stack.yml
@@ -0,0 +1,108 @@
+version: '3.1'
+
+services:
+
+    comanage-registry-database:
+        image: mariadb
+        volumes:
+            - /opt/mariadb-data:/var/lib/mysql
+        environment:
+            - MYSQL_ROOT_PASSWORD_FILE=/run/secrets/mysql_root_password 
+            - MYSQL_DATABASE=registry
+            - MYSQL_USER=registry_user
+            - MYSQL_PASSWORD_FILE=/run/secrets/mysql_registry_user_password
+        secrets:
+            - mysql_root_password
+            - mysql_registry_user_password
+        networks:
+            - default
+        deploy:
+            replicas: 1
+
+    comanage-registry-ldap:
+        image: cilogon/comanage-registry-slapd-cilogon
+        volumes:
+            - /opt/slapd-data:/var/lib/ldap
+            - /opt/slapd-config:/etc/ldap/slapd.d
+        environment:
+            - SLAPD_CERT_FILE=/run/secrets/slapd_cert_file
+            - SLAPD_PRIVKEY_FILE=/run/secrets/slapd_privkey_file
+            - SLAPD_CHAIN_FILE=/run/secrets/slapd_chain_file
+            - OLC_ROOT_PW_FILE=/run/secrets/olc_root_pw
+            - OLC_SUFFIX=dc=cilogon,dc=org
+            - OLC_ROOT_DN=cn=admin,dc=cilogon,dc=org
+        secrets:
+            - slapd_cert_file
+            - slapd_privkey_file
+            - slapd_chain_file
+            - olc_root_pw
+        networks:
+            - default
+        ports:
+            - "636:636"
+            - "389:389"
+        deploy:
+            replicas: 1
+
+    comanage-registry:
+        image: cilogon/comanage-registry:2.0.0-rc3
+        volumes:
+            - /opt/comanage-registry-local:/local
+        environment:
+            - OIDC_CLIENT_ID_FILE=/run/secrets/oidc_client_id 
+            - OIDC_CLIENT_SECRET_FILE=/run/secrets/oidc_client_secret 
+            - OIDC_PROVIDER_METADATA_URL_FILE=/run/secrets/oidc_provider_metadata_url 
+            - OIDC_CRYPTO_PASSPHRASE_FILE=/run/secrets/oidc_crypto_passphrase 
+            - REGISTRY_HOST_FILE=/run/secrets/registry_host 
+            - HTTPS_CERT_FILE=/run/secrets/https_cert_file 
+            - HTTPS_PRIVKEY_FILE=/run/secrets/https_privkey_file 
+            - HTTPS_CHAIN_FILE=/run/secrets/https_chain_file 
+            - COMANAGE_REGISTRY_ADMIN_GIVEN_NAME=ScottCmpAdmin
+            - COMANAGE_REGISTRY_ADMIN_FAMILY_NAME=Koranda
+            - COMANAGE_REGISTRY_ADMIN_USERNAME=http://cilogon.org/serverA/users/22981
+        secrets:
+            - oidc_client_id
+            - oidc_client_secret
+            - oidc_provider_metadata_url
+            - oidc_crypto_passphrase
+            - registry_host
+            - https_cert_file
+            - https_privkey_file
+            - https_chain_file
+        networks:
+            - default
+        ports:
+            - "80:80"
+            - "443:443"
+        deploy:
+            replicas: 1
+
+secrets:
+    mysql_root_password:
+        external: true
+    mysql_registry_user_password:
+        external: true  
+    slapd_cert_file:
+        external: true
+    slapd_privkey_file:
+        external: true
+    slapd_chain_file:
+        external: true
+    olc_root_pw:
+        external: true
+    oidc_client_id:
+        external: true
+    oidc_client_secret:
+        external: true
+    oidc_provider_metadata_url:
+        external: true
+    oidc_crypto_passphrase:
+        external: true
+    registry_host:
+        external: true
+    https_cert_file:
+        external: true
+    https_privkey_file:
+        external: true
+    https_chain_file:
+        external: true
diff --git a/compose/docker-compose.yml b/compose/docker-compose.yml
deleted file mode 100644
index b45b159..0000000
--- a/compose/docker-compose.yml
+++ /dev/null
@@ -1,41 +0,0 @@
-# COmanage Registry Docker compose
-# 
-# Portions licensed to the University Corporation for Advanced Internet
-# Development, Inc. ("UCAID") under one or more contributor license agreements.
-# See the NOTICE file distributed with this work for additional information
-# regarding copyright ownership.
-# 
-# UCAID licenses this file to you under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with the
-# License. You may obtain a copy of the License at:
-# 
-# http://www.apache.org/licenses/LICENSE-2.0
-# 
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-version: '2.1'
-services:
-  comanage-registry:
-    image: sphericalcowgroup/comanage-registry:develop-shibboleth-sp
-    ports:
-     - "80:80"
-     - "443:443"
-    volumes:
-     - /opt/comanage-registry:/local
-     - /tmp/shibboleth2.xml:/etc/shibboleth/shibboleth2.xml
-    depends_on:
-      comanage-registry-database:
-        condition: service_healthy
-  comanage-registry-database:
-    image: sphericalcowgroup/comanage-registry-postgres
-    volumes:
-     - /tmp/postgres-data:/var/lib/postgresql/data
-    healthcheck:
-      test: ["CMD", "psql", "-h", "comanage-registry-database", "-U", "postgres", "-c", "\\l"]
-      interval: 5s
-      timeout: 5s
-      retries: 3