diff --git a/roles/core/templates/apps-docs-compose.j2 b/roles/core/templates/apps-docs-compose.j2
deleted file mode 100644
index 985d80b..0000000
--- a/roles/core/templates/apps-docs-compose.j2
+++ /dev/null
@@ -1,57 +0,0 @@
-services:
-  mariadb:
-    image: lscr.io/linuxserver/mariadb:latest
-    restart: always
-    environment:
-      MYSQL_ROOT_PASSWORD: {{ global_db_pass }}
-      MYSQL_DATABASE: bookstackapp
-      MYSQL_USER: bookstack
-      MYSQL_PASSWORD: {{ global_db_pass }}
-    volumes:
-      - mysql_data:/config
-
-  bookstack:
-    image: lscr.io/linuxserver/bookstack:latest
-    depends_on:
-      - mariadb
-    environment:
-      APP_URL: http://{{ core_ip }}:6875
-      DB_HOST: mariadb
-      DB_USER: bookstack
-      DB_PASS: {{ global_db_pass }}
-      DB_DATABASE: bookstackapp
-    ports:
-      - "6875:80"
-
-  metabase:
-    image: metabase/metabase:latest
-    ports:
-      - "3001:3000"
-
-  gotenberg:
-    image: gotenberg/gotenberg:8
-    ports:
-      - "3002:3000"
-
-  carbone:
-    image: "{{ carbone_image }}:{{ carbone_version }}"
-    container_name: carbone
-    restart: unless-stopped
-    ports:
-      - "{{ carbone_port }}:4000"
-    environment:
-      TZ: "{{ timezone }}"
-    volumes:
-      - carbone_templates:/app/templates
-      - carbone_output:/app/output
-    healthcheck:
-      test: ["CMD", "wget", "--quiet", "--tries=1", "--spider", "http://localhost:4000/"]
-      interval: 30s
-      timeout: 10s
-      retries: 3
-      start_period: 40s
-
-volumes:
-  mysql_data:
-  carbone_templates:
-  carbone_output:
diff --git a/roles/core/templates/docs-compose.j2 b/roles/core/templates/docs-compose.j2
index 4870e25..985d80b 100644
--- a/roles/core/templates/docs-compose.j2
+++ b/roles/core/templates/docs-compose.j2
@@ -6,7 +6,7 @@ services:
       MYSQL_ROOT_PASSWORD: {{ global_db_pass }}
       MYSQL_DATABASE: bookstackapp
       MYSQL_USER: bookstack
-      MYSQL_PASSWORD: BookStackPass
+      MYSQL_PASSWORD: {{ global_db_pass }}
     volumes:
       - mysql_data:/config
 
@@ -15,10 +15,10 @@ services:
     depends_on:
       - mariadb
     environment:
-      APP_URL: http://{{ ansible_host }}:6875
+      APP_URL: http://{{ core_ip }}:6875
       DB_HOST: mariadb
       DB_USER: bookstack
-      DB_PASS: BookStackPass
+      DB_PASS: {{ global_db_pass }}
       DB_DATABASE: bookstackapp
     ports:
       - "6875:80"
@@ -33,5 +33,25 @@ services:
     ports:
       - "3002:3000"
 
+  carbone:
+    image: "{{ carbone_image }}:{{ carbone_version }}"
+    container_name: carbone
+    restart: unless-stopped
+    ports:
+      - "{{ carbone_port }}:4000"
+    environment:
+      TZ: "{{ timezone }}"
+    volumes:
+      - carbone_templates:/app/templates
+      - carbone_output:/app/output
+    healthcheck:
+      test: ["CMD", "wget", "--quiet", "--tries=1", "--spider", "http://localhost:4000/"]
+      interval: 30s
+      timeout: 10s
+      retries: 3
+      start_period: 40s
+
 volumes:
   mysql_data:
+  carbone_templates:
+  carbone_output: