diff --git a/templates/compose/passbolt.yaml b/templates/compose/passbolt.yaml
index fb05deb68..9a454a088 100644
--- a/templates/compose/passbolt.yaml
+++ b/templates/compose/passbolt.yaml
@@ -2,50 +2,48 @@
 # slogan: Passbolt Community Edition (CE) API. The JSON API for the open source password manager for teams!
 # tags: security, credentials, password-manager, open source
 # logo: svgs/passbolt.svg
+# port: 80
 
 services:
-  mariadb:
-    image: 'mariadb:11'
-    environment:
-      - MARIADB_RANDOM_ROOT_PASSWORD=true
-      - MARIADB_DATABASE=${MYSQL_DB:-passbolt}
-      - MARIADB_USER=${SERVICE_USER_PASSBOLT}
-      - MARIADB_PASSWORD=${SERVICE_PASSWORD_PASSBOLT}
-    volumes:
-      - 'database_volume:/var/lib/mysql'
-    healthcheck:
-      test: ["CMD", "healthcheck.sh", "--connect", "--innodb_initialized"]
-      interval: 5s
-      timeout: 20s
-      retries: 10
   passbolt:
-    image: 'passbolt/passbolt:latest-ce'
-    depends_on:
-      - mariadb
+    image: passbolt/passbolt:latest-ce
     environment:
       - SERVICE_FQDN_PASSBOLT
       - APP_FULL_BASE_URL=${SERVICE_FQDN_PASSBOLT}
       - DATASOURCES_DEFAULT_HOST=mariadb
       - DATASOURCES_DEFAULT_USERNAME=${SERVICE_USER_PASSBOLT}
       - DATASOURCES_DEFAULT_PASSWORD=${SERVICE_PASSWORD_PASSBOLT}
-      - DATASOURCES_DEFAULT_DATABASE=${MYSQL_DB:-passbolt}
+      - DATASOURCES_DEFAULT_DATABASE=${MYSQL_DB:-passbolt-db}
     volumes:
-      - 'gpg_volume:/etc/passbolt/gpg'
-      - 'jwt_volume:/etc/passbolt/jwt'
+      - "gpg_volume:/etc/passbolt/gpg"
+      - "jwt_volume:/etc/passbolt/jwt"
     command:
       - /usr/bin/wait-for.sh
-      - '-t'
-      - '0'
-      - 'mariadb:3306'
-      - '--'
+      - "-t"
+      - "0"
+      - "mariadb:3306"
+      - "--"
       - /docker-entrypoint.sh
+    depends_on:
+      mariadb:
+        condition: service_healthy
     healthcheck:
       test: ["CMD", "curl", "-f", "http://127.0.0.1:80"]
       interval: 5s
       timeout: 20s
       retries: 10
 
-volumes:
-  database_volume:
-  gpg_volume:
-  jwt_volume:
+  mariadb:
+    image: mariadb:11
+    environment:
+      - MARIADB_ROOT_PASSWORD=${SERVICE_PASSWORD_ROOTMARIADB}
+      - MARIADB_DATABASE=${MYSQL_DB:-passbolt-db}
+      - MARIADB_USER=${SERVICE_USER_PASSBOLT}
+      - MARIADB_PASSWORD=${SERVICE_PASSWORD_PASSBOLT}
+    volumes:
+      - "passbolt_mariadb_data:/var/lib/mysql"
+    healthcheck:
+      test: ["CMD", "healthcheck.sh", "--connect", "--innodb_initialized"]
+      interval: 5s
+      timeout: 20s
+      retries: 10
diff --git a/templates/service-templates.json b/templates/service-templates.json
index 76c414a38..912b57a56 100644
--- a/templates/service-templates.json
+++ b/templates/service-templates.json
@@ -2447,6 +2447,20 @@
         "minversion": "0.0.0",
         "port": "8000"
     },
+    "passbolt": {
+        "documentation": "https://www.passbolt.com/ce/docker?utm_source=coolify.io",
+        "slogan": "Passbolt Community Edition (CE) API. The JSON API for the open source password manager for teams!",
+        "compose": "c2VydmljZXM6CiAgcGFzc2JvbHQ6CiAgICBpbWFnZTogJ3Bhc3Nib2x0L3Bhc3Nib2x0OmxhdGVzdC1jZScKICAgIGVudmlyb25tZW50OgogICAgICAtIFNFUlZJQ0VfRlFETl9QQVNTQk9MVAogICAgICAtICdBUFBfRlVMTF9CQVNFX1VSTD0ke1NFUlZJQ0VfRlFETl9QQVNTQk9MVH0nCiAgICAgIC0gREFUQVNPVVJDRVNfREVGQVVMVF9IT1NUPW1hcmlhZGIKICAgICAgLSAnREFUQVNPVVJDRVNfREVGQVVMVF9VU0VSTkFNRT0ke1NFUlZJQ0VfVVNFUl9QQVNTQk9MVH0nCiAgICAgIC0gJ0RBVEFTT1VSQ0VTX0RFRkFVTFRfUEFTU1dPUkQ9JHtTRVJWSUNFX1BBU1NXT1JEX1BBU1NCT0xUfScKICAgICAgLSAnREFUQVNPVVJDRVNfREVGQVVMVF9EQVRBQkFTRT0ke01ZU1FMX0RCOi1wYXNzYm9sdC1kYn0nCiAgICB2b2x1bWVzOgogICAgICAtICdncGdfdm9sdW1lOi9ldGMvcGFzc2JvbHQvZ3BnJwogICAgICAtICdqd3Rfdm9sdW1lOi9ldGMvcGFzc2JvbHQvand0JwogICAgY29tbWFuZDoKICAgICAgLSAvdXNyL2Jpbi93YWl0LWZvci5zaAogICAgICAtICctdCcKICAgICAgLSAnMCcKICAgICAgLSAnbWFyaWFkYjozMzA2JwogICAgICAtICctLScKICAgICAgLSAvZG9ja2VyLWVudHJ5cG9pbnQuc2gKICAgIGRlcGVuZHNfb246CiAgICAgIG1hcmlhZGI6CiAgICAgICAgY29uZGl0aW9uOiBzZXJ2aWNlX2hlYWx0aHkKICAgIGhlYWx0aGNoZWNrOgogICAgICB0ZXN0OgogICAgICAgIC0gQ01ECiAgICAgICAgLSBjdXJsCiAgICAgICAgLSAnLWYnCiAgICAgICAgLSAnaHR0cDovLzEyNy4wLjAuMTo4MCcKICAgICAgaW50ZXJ2YWw6IDVzCiAgICAgIHRpbWVvdXQ6IDIwcwogICAgICByZXRyaWVzOiAxMAogIG1hcmlhZGI6CiAgICBpbWFnZTogJ21hcmlhZGI6MTEnCiAgICBlbnZpcm9ubWVudDoKICAgICAgLSAnTUFSSUFEQl9ST09UX1BBU1NXT1JEPSR7U0VSVklDRV9QQVNTV09SRF9ST09UTUFSSUFEQn0nCiAgICAgIC0gJ01BUklBREJfREFUQUJBU0U9JHtNWVNRTF9EQjotcGFzc2JvbHQtZGJ9JwogICAgICAtICdNQVJJQURCX1VTRVI9JHtTRVJWSUNFX1VTRVJfUEFTU0JPTFR9JwogICAgICAtICdNQVJJQURCX1BBU1NXT1JEPSR7U0VSVklDRV9QQVNTV09SRF9QQVNTQk9MVH0nCiAgICB2b2x1bWVzOgogICAgICAtICdwYXNzYm9sdF9tYXJpYWRiX2RhdGE6L3Zhci9saWIvbXlzcWwnCiAgICBoZWFsdGhjaGVjazoKICAgICAgdGVzdDoKICAgICAgICAtIENNRAogICAgICAgIC0gaGVhbHRoY2hlY2suc2gKICAgICAgICAtICctLWNvbm5lY3QnCiAgICAgICAgLSAnLS1pbm5vZGJfaW5pdGlhbGl6ZWQnCiAgICAgIGludGVydmFsOiA1cwogICAgICB0aW1lb3V0OiAyMHMKICAgICAgcmV0cmllczogMTAK",
+        "tags": [
+            "security",
+            "credentials",
+            "password-manager",
+            "open source"
+        ],
+        "logo": "svgs/passbolt.svg",
+        "minversion": "0.0.0",
+        "port": "80"
+    },
     "penpot": {
         "documentation": "https://help.penpot.app/technical-guide/getting-started/#install-with-docker?utm_source=coolify.io",
         "slogan": "Penpot is the first Open Source design and prototyping platform for product teams.",