diff --git a/db/docker-compose.yml b/db/docker-compose.yml
index ef711e6..203d041 100644
--- a/db/docker-compose.yml
+++ b/db/docker-compose.yml
@@ -13,6 +13,7 @@ services:
       - ./docker/provision/mysql/init:/docker-entrypoint-initdb.d
 volumes:
   db:
+    external: true
 networks:
   default:
     name: nginx-proxy
diff --git a/nextcloud/docker-compose.yml b/nextcloud/docker-compose.yml
index 71862c3..fa92395 100644
--- a/nextcloud/docker-compose.yml
+++ b/nextcloud/docker-compose.yml
@@ -1,7 +1,20 @@
 services:
+  redis:
+    image: redis:alpine
+    container_name: redis-dbcache
+    restart: unless-stopped
+  db:
+    image: mysql:latest
+    restart: always
+    command: --transaction-isolation=READ-COMMITTED --log-bin=binlog --binlog-format=ROW
+    volumes:
+      - db:/var/lib/mysql
+    environment:
+      - MYSQL_ROOT_PASSWORD=${DBPASS}
+      - MYSQL_PASSWORD=${DBPASS}
+      - MYSQL_DATABASE=nextcloud
+      - MYSQL_USER=root
   nextcloud:
-    depends_on:
-      - db
     image: lscr.io/linuxserver/nextcloud:latest
     container_name: nextcloud
     environment:
@@ -16,11 +29,13 @@ services:
       REDIS_HOST: redis
       LETSENCRYPT_HOST: nextcloud.${DOMAIN}
       LETSENCRYPT_EMAIL: ${EMAIL}
-      # LETSENCRYPT_TEST: true
+      LETSENCRYPT_TEST: true
     volumes:
       - ${CONFIG_LOCATION}/nextcloud:/config
       - ${DATA_LOCATION}/Cloud/Nextcloud:/data
     restart: unless-stopped
+volumes:
+  db:
 networks:
   default:
     name: nginx-proxy
diff --git a/db/docker/provision/mysql/init/01-databases.sql b/nextcloud/docker/provision/mysql/init/01-databases.sql
similarity index 100%
rename from db/docker/provision/mysql/init/01-databases.sql
rename to nextcloud/docker/provision/mysql/init/01-databases.sql
diff --git a/wordpress/docker-compose.yml b/wordpress/docker-compose.yml
index 43aa6ff..160b150 100644
--- a/wordpress/docker-compose.yml
+++ b/wordpress/docker-compose.yml
@@ -1,21 +1,33 @@
 services:
+  db:
+    image: mysql:8.0
+    restart: always
+    environment:
+      MYSQL_DATABASE: clocktower
+      MYSQL_USER: root
+      MYSQL_PASSWORD: ${DBPASS}
+      MYSQL_RANDOM_ROOT_PASSWORD: '1'
+    volumes:
+      - db:/var/lib/mysql
   wordpress-botc:
-  depends_on:
-    - db
-  image: wordpress
-  restart: always
-  environment:
-    WORDPRESS_DB_HOST: db
-    WORDPRESS_DB_USER: root
-    WORDPRESS_DB_PASSWORD: ${DBPASS}
-    WORDPRESS_DB_NAME: clocktower
-    VIRTUAL_HOST: "botc.${DOMAIN}, *.phillybotc.com"
-    LETSENCRYPT_HOST: "botc.${DOMAIN}, *.phillybotc.com"
-    LETSENCRYPT_EMAIL: ${EMAIL}
-  volumes:
-    - wordpress-botc:/var/www/html
+    depends_on:
+      - db
+    image: wordpress
+    restart: always
+    environment:
+      WORDPRESS_DB_HOST: db
+      WORDPRESS_DB_USER: root
+      WORDPRESS_DB_PASSWORD: ${DBPASS}
+      WORDPRESS_DB_NAME: clocktower
+      VIRTUAL_HOST: "botc.${DOMAIN}, *.phillybotc.com, phillybotc.com"
+      LETSENCRYPT_HOST: "botc.${DOMAIN}, *.phillybotc.com, phillybotc.com"
+      LETSENCRYPT_EMAIL: ${EMAIL}
+      LETSENCRYPT_TEST: true
+    volumes:
+      - wordpress-botc:/var/www/html
 volumes:
   wordpress-botc:
+  db:
 networks:
   default:
     name: nginx-proxy