diff --git a/.env.default b/.env.default
index 76c20d3..f452b90 100644
--- a/.env.default
+++ b/.env.default
@@ -28,18 +28,19 @@ DOCKER_AE_SERVER_EXTRA_HOST=example.oneskyit.com:192.168.32.20
 DOCKER_AE_APP_SERVER_EXTRA_HOST=example-app.oneskyit.com:192.168.32.20
 DOCKER_AE_API_SERVER_EXTRA_HOST=example-api.oneskyit.com:192.168.32.20
 DOCKER_AE_API_BAK_SERVER_EXTRA_HOST=example-bak-api.oneskyit.com:192.168.32.20
-DOCKER_AE_API_V5_SERVER_EXTRA_HOST=example-api-v5.oneskyit.com:192.168.32.20
+# DOCKER_AE_API_V5_SERVER_EXTRA_HOST=example-api-v5.oneskyit.com:192.168.32.20
 DOCKER_AE_APP_EXTRA_HOST=example-api.oneskyit.com:192.168.32.20 # This should be a static(ish) IP. It may need to be externally routable? prod-api.oneskyit.com:104.237.143.4
-DOCKER_AE_APP_EXTRA_HOST_V5=example-api-v5.oneskyit.com:192.168.32.20
+# DOCKER_AE_APP_EXTRA_HOST_V5=example-api-v5.oneskyit.com:192.168.32.20
 DOCKER_AE_DB_SERVER_EXTRA_HOST=db.oneskyit.com:104.237.143.4
 
 # This is the server name for nginx for each of these sites.
-# Only one server name per server_name in nginx with envsubst!!! A bug???
-DOCKER_AE_API_SERVER_NAME=example-api.oneskyit.com
-DOCKER_AE_API_V5_SERVER_NAME=example-api-v5.oneskyit.com
-DOCKER_AE_APP_SERVER_NAME=example-app.oneskyit.com
+# NEW NOTE: Each server name should be separated by a space.
+# OLD NOTE: Only one server name per server_name in nginx with envsubst!!! A bug???
+DOCKER_AE_API_SERVER_NAME=test-api.oneskyit.com example-api.oneskyit.com
+# DOCKER_AE_API_V5_SERVER_NAME=example-api-v5.oneskyit.com
+DOCKER_AE_APP_SERVER_NAME=test-app.oneskyit.com test-demo.oneskyit.com example-app.oneskyit.com
 DOCKER_PHPMYADMIN_SERVER_NAME=example-phpmyadmin.oneskyit.com
-DOCKER_OSIT_SERVER_NAME=example.oneskyit.com
+DOCKER_OSIT_SERVER_NAME=example-docker.oneskyit.com # bak-docker.oneskyit.com dev-docker.oneskyit.com test-docker.oneskyit.com prod-docker.oneskyit.com
 
 # This needs to be updated for each client's subdomain.
 # This is *not* currently working with the nginx Docker Compose. It uses envsubst with a template conf file.
diff --git a/conf/nginx/site-enabled_aether_flask_gunicorn.conf b/conf/nginx/site-enabled_aether_flask_gunicorn.conf
index 6581334..65e8eb5 100644
--- a/conf/nginx/site-enabled_aether_flask_gunicorn.conf
+++ b/conf/nginx/site-enabled_aether_flask_gunicorn.conf
@@ -33,15 +33,15 @@ server {
         dev-rli.oneskyit.com *.dev-rli.oneskyit.com
 
         sr-app.oneskyit.com
-        # sr-connect.oneskyit.com *.sr-connect.oneskyit.com
-        # sr-demo.oneskyit.com *.sr-demo.oneskyit.com
+        sr-connect.oneskyit.com *.sr-connect.oneskyit.com
+        sr-demo.oneskyit.com *.sr-demo.oneskyit.com
 
-        # sr-aacc.oneskyit.com *.sr-aacc.oneskyit.com
-        # sr-aapor.oneskyit.com *.sr-aapor.oneskyit.com
-        # sr-businessgroup.oneskyit.com *.sr-businessgroup.oneskyit.com
-        # sr-cmsc.oneskyit.com *.sr-cmsc.oneskyit.com
-        # sr-lci.oneskyit.com *.sr-lci.oneskyit.com
-        # sr-ncsd.oneskyit.com *.sr-ncsd.oneskyit.com
+        sr-aacc.oneskyit.com *.sr-aacc.oneskyit.com
+        sr-aapor.oneskyit.com *.sr-aapor.oneskyit.com
+        sr-businessgroup.oneskyit.com *.sr-businessgroup.oneskyit.com
+        sr-cmsc.oneskyit.com *.sr-cmsc.oneskyit.com
+        sr-lci.oneskyit.com *.sr-lci.oneskyit.com
+        sr-ncsd.oneskyit.com *.sr-ncsd.oneskyit.com
 
         test-app.oneskyit.com
         # test-idaa.oneskyit.com *.test-idaa.oneskyit.com
@@ -102,23 +102,23 @@ server {
         dev-aapor.oneskyit.com *.dev-aapor.oneskyit.com
         dev-businessgroup.oneskyit.com *.dev-businessgroup.oneskyit.com
         dev-chow.oneskyit.com *.dev-chow.oneskyit.com
-        dev-cmsc.oneskyit.com *.dev-cmsc.oneskyit.com
+        # dev-cmsc.oneskyit.com *.dev-cmsc.oneskyit.com
         dev-idaa.oneskyit.com *.dev-idaa.oneskyit.com
         dev-ishlt.oneskyit.com *.dev-ishlt.oneskyit.com
         dev-lci.oneskyit.com *.dev-lci.oneskyit.com
-        dev-ncsd.oneskyit.com *.dev-ncsd.oneskyit.com
+        # dev-ncsd.oneskyit.com *.dev-ncsd.oneskyit.com
         dev-npa.oneskyit.com *.dev-npa.oneskyit.com
         dev-rli.oneskyit.com *.dev-rli.oneskyit.com
 
         sr-app.oneskyit.com
-        # sr-connect.oneskyit.com *.sr-connect.oneskyit.com
-        # sr-demo.oneskyit.com *.sr-demo.oneskyit.com
+        sr-connect.oneskyit.com *.sr-connect.oneskyit.com
+        sr-demo.oneskyit.com *.sr-demo.oneskyit.com
 
-        # sr-aacc.oneskyit.com *.sr-aacc.oneskyit.com
-        # sr-aapor.oneskyit.com *.sr-aapor.oneskyit.com
-        # sr-businessgroup.oneskyit.com *.sr-businessgroup.oneskyit.com
+        sr-aacc.oneskyit.com *.sr-aacc.oneskyit.com
+        sr-aapor.oneskyit.com *.sr-aapor.oneskyit.com
+        sr-businessgroup.oneskyit.com *.sr-businessgroup.oneskyit.com
         # sr-cmsc.oneskyit.com *.sr-cmsc.oneskyit.com
-        # sr-lci.oneskyit.com *.sr-lci.oneskyit.com
+        sr-lci.oneskyit.com *.sr-lci.oneskyit.com
         # sr-ncsd.oneskyit.com *.sr-ncsd.oneskyit.com
 
         test-app.oneskyit.com
@@ -131,8 +131,8 @@ server {
 
     include /etc/nginx/options-ssl-nginx.conf;
 
-    ssl_certificate /etc/certs/fullchain.pem;
-    ssl_certificate_key /etc/certs/privkey.pem;
+    ssl_certificate /etc/certs/fullchain_wild.pem;
+    ssl_certificate_key /etc/certs/privkey_wild.pem;
     ssl_dhparam /etc/certs/ssl-dhparams.pem;
 
     # include brotli.conf;
diff --git a/conf/nginx/site-enabled_oneskyit.conf b/conf/nginx/site-enabled_oneskyit.conf
index 54cbbb4..faa90ee 100644
--- a/conf/nginx/site-enabled_oneskyit.conf
+++ b/conf/nginx/site-enabled_oneskyit.conf
@@ -2,7 +2,7 @@ server {
     listen 80;
     listen [::]:80;
 
-    server_name dev-docker.oneskyit.com test-docker.oneskyit.com prod-docker.oneskyit.com ${DOCKER_OSIT_SERVER_NAME};
+    server_name docker.oneskyit.com ${DOCKER_OSIT_SERVER_NAME};
     # server_name oneskyit.localhost;
 
     access_log  /logs/nginx/access_oneskyit.log;
@@ -49,7 +49,7 @@ server {
     http2 on;
 
     # server_name docker.oneskyit.com ${DOCKER_OSIT_SERVER_NAME};
-    server_name docker.oneskyit.com dev-docker.oneskyit.com test-docker.oneskyit.com prod-docker.oneskyit.com ${DOCKER_OSIT_SERVER_NAME};
+    server_name docker.oneskyit.com ${DOCKER_OSIT_SERVER_NAME};
     # server_name docker.oneskyit.com dev.oneskyit.com test.oneskyit.com prod.oneskyit.com;
     # server_name docker.oneskyit.com;
 
diff --git a/docker-compose.yml b/docker-compose.yml
index dbef1b2..8a9e954 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -116,6 +116,8 @@ services:
     #         - PMA_ARBITRARY=1
     #         - UPLOAD_LIMIT=1G
 
+    # Need to fix the memory overcommit warning from Redis
+    # https://ourcodeworld.com/articles/read/2083/how-to-remove-redis-warning-on-docker-memory-overcommit-must-be-enabled
     redis:
         restart: always
         container_name: ${CONTAINER_REDIS}