diff --git a/templates/compose/docuseal-with-postgres.yaml b/templates/compose/docuseal-with-postgres.yaml
index 78e0d70a7..f30201db0 100644
--- a/templates/compose/docuseal-with-postgres.yaml
+++ b/templates/compose/docuseal-with-postgres.yaml
@@ -5,35 +5,31 @@
 
 services:
   docuseal:
-    image: 'docuseal/docuseal:latest'
+    image: docuseal/docuseal:latest
     environment:
       - SERVICE_FQDN_DOCUSEAL
-      - 'HOST=${SERVICE_FQDN_DOCUSEAL}'
-      - 'DATABASE_URL=postgresql://$SERVICE_USER_POSTGRES:$SERVICE_PASSWORD_POSTGRES@postgresql:5432/${POSTGRES_DB}'
+      - HOST=${SERVICE_FQDN_DOCUSEAL}
+      - DATABASE_URL=postgresql://$SERVICE_USER_POSTGRES:$SERVICE_PASSWORD_POSTGRES@postgresql:5432/${POSTGRES_DB}
     volumes:
-      - 'docuseal-data:/data'
+      - docuseal-data:/data
     depends_on:
       postgresql:
         condition: service_healthy
     healthcheck:
-      test:
-        - CMD-SHELL
-        - 'wget -qO- http://localhost:3000'
+      test: ["CMD", "curl", "-f", "http://localhost:3000"]
       interval: 5s
       timeout: 20s
       retries: 10
   postgresql:
-    image: 'postgres:16-alpine'
+    image: postgres:16-alpine
     volumes:
-      - 'postgresql-data:/var/lib/postgresql/data'
+      - postgresql-data:/var/lib/postgresql/data
     environment:
       - POSTGRES_USER=$SERVICE_USER_POSTGRES
       - POSTGRES_PASSWORD=$SERVICE_PASSWORD_POSTGRES
-      - 'POSTGRES_DB=${POSTGRES_DB:-docuseal}'
+      - POSTGRES_DB=${POSTGRES_DB:-docuseal}
     healthcheck:
-      test:
-        - CMD-SHELL
-        - 'pg_isready -U $${POSTGRES_USER} -d $${POSTGRES_DB}'
+      test: ["CMD-SHELL", "pg_isready -U $${POSTGRES_USER} -d $${POSTGRES_DB}"]
       interval: 5s
       timeout: 20s
-      retries: 10
+      retries: 10
\ No newline at end of file
diff --git a/templates/compose/docuseal.yaml b/templates/compose/docuseal.yaml
index f286b97d8..3d74c0ecb 100644
--- a/templates/compose/docuseal.yaml
+++ b/templates/compose/docuseal.yaml
@@ -5,16 +5,14 @@
 
 services:
   docuseal:
-    image: 'docuseal/docuseal:latest'
+    image: docuseal/docuseal:latest
     environment:
       - SERVICE_FQDN_DOCUSEAL
-      - 'HOST=${SERVICE_FQDN_DOCUSEAL}'
+      - HOST=${SERVICE_FQDN_DOCUSEAL}
     volumes:
-      - 'docuseal-data:/data'
+      - docuseal-data:/data
     healthcheck:
-      test:
-        - CMD-SHELL
-        - 'wget -qO- http://localhost:3000'
+      test: ["CMD", "curl", "-f", "http://localhost:3000"]
       interval: 5s
       timeout: 20s
       retries: 10
\ No newline at end of file
diff --git a/templates/service-templates.json b/templates/service-templates.json
index 415fe0cac..c3d079ac8 100644
--- a/templates/service-templates.json
+++ b/templates/service-templates.json
@@ -216,7 +216,7 @@
     "docuseal-with-postgresql": {
         "documentation": "https:\/\/www.docuseal.co",
         "slogan": "Document Signing for Everyone free forever for individuals, extensible for businesses and developers. Open Source Alternative to DocuSign, PandaDoc and more.",
-        "compose": "c2VydmljZXM6CiAgZG9jdXNlYWw6CiAgICBpbWFnZTogJ2RvY3VzZWFsL2RvY3VzZWFsOmxhdGVzdCcKICAgIGVudmlyb25tZW50OgogICAgICAtIFNFUlZJQ0VfRlFETl9ET0NVU0VBTAogICAgICAtICdIT1NUPSR7U0VSVklDRV9GUUROX0RPQ1VTRUFMfScKICAgICAgLSAnREFUQUJBU0VfVVJMPXBvc3RncmVzcWw6Ly8kU0VSVklDRV9VU0VSX1BPU1RHUkVTOiRTRVJWSUNFX1BBU1NXT1JEX1BPU1RHUkVTQHBvc3RncmVzcWw6NTQzMi8ke1BPU1RHUkVTX0RCfScKICAgIHZvbHVtZXM6CiAgICAgIC0gJ2RvY3VzZWFsLWRhdGE6L2RhdGEnCiAgICBkZXBlbmRzX29uOgogICAgICBwb3N0Z3Jlc3FsOgogICAgICAgIGNvbmRpdGlvbjogc2VydmljZV9oZWFsdGh5CiAgICBoZWFsdGhjaGVjazoKICAgICAgdGVzdDoKICAgICAgICAtIENNRC1TSEVMTAogICAgICAgIC0gJ3dnZXQgLXFPLSBodHRwOi8vbG9jYWxob3N0OjMwMDAnCiAgICAgIGludGVydmFsOiA1cwogICAgICB0aW1lb3V0OiAyMHMKICAgICAgcmV0cmllczogMTAKICBwb3N0Z3Jlc3FsOgogICAgaW1hZ2U6ICdwb3N0Z3JlczoxNi1hbHBpbmUnCiAgICB2b2x1bWVzOgogICAgICAtICdwb3N0Z3Jlc3FsLWRhdGE6L3Zhci9saWIvcG9zdGdyZXNxbC9kYXRhJwogICAgZW52aXJvbm1lbnQ6CiAgICAgIC0gUE9TVEdSRVNfVVNFUj0kU0VSVklDRV9VU0VSX1BPU1RHUkVTCiAgICAgIC0gUE9TVEdSRVNfUEFTU1dPUkQ9JFNFUlZJQ0VfUEFTU1dPUkRfUE9TVEdSRVMKICAgICAgLSAnUE9TVEdSRVNfREI9JHtQT1NUR1JFU19EQjotZG9jdXNlYWx9JwogICAgaGVhbHRoY2hlY2s6CiAgICAgIHRlc3Q6CiAgICAgICAgLSBDTUQtU0hFTEwKICAgICAgICAtICdwZ19pc3JlYWR5IC1VICQke1BPU1RHUkVTX1VTRVJ9IC1kICQke1BPU1RHUkVTX0RCfScKICAgICAgaW50ZXJ2YWw6IDVzCiAgICAgIHRpbWVvdXQ6IDIwcwogICAgICByZXRyaWVzOiAxMA==",
+        "compose": "c2VydmljZXM6CiAgZG9jdXNlYWw6CiAgICBpbWFnZTogZG9jdXNlYWwvZG9jdXNlYWw6bGF0ZXN0CiAgICBlbnZpcm9ubWVudDoKICAgICAgLSBTRVJWSUNFX0ZRRE5fRE9DVVNFQUwKICAgICAgLSBIT1NUPSR7U0VSVklDRV9GUUROX0RPQ1VTRUFMfQogICAgICAtIERBVEFCQVNFX1VSTD1wb3N0Z3Jlc3FsOi8vJFNFUlZJQ0VfVVNFUl9QT1NUR1JFUzokU0VSVklDRV9QQVNTV09SRF9QT1NUR1JFU0Bwb3N0Z3Jlc3FsOjU0MzIvJHtQT1NUR1JFU19EQn0KICAgIHZvbHVtZXM6CiAgICAgIC0gZG9jdXNlYWwtZGF0YTovZGF0YQogICAgZGVwZW5kc19vbjoKICAgICAgcG9zdGdyZXNxbDoKICAgICAgICBjb25kaXRpb246IHNlcnZpY2VfaGVhbHRoeQogICAgaGVhbHRoY2hlY2s6CiAgICAgIHRlc3Q6IFsiQ01EIiwgImN1cmwiLCAiLWYiLCAiaHR0cDovL2xvY2FsaG9zdDozMDAwIl0KICAgICAgaW50ZXJ2YWw6IDVzCiAgICAgIHRpbWVvdXQ6IDIwcwogICAgICByZXRyaWVzOiAxMAogIHBvc3RncmVzcWw6CiAgICBpbWFnZTogcG9zdGdyZXM6MTYtYWxwaW5lCiAgICB2b2x1bWVzOgogICAgICAtIHBvc3RncmVzcWwtZGF0YTovdmFyL2xpYi9wb3N0Z3Jlc3FsL2RhdGEKICAgIGVudmlyb25tZW50OgogICAgICAtIFBPU1RHUkVTX1VTRVI9JFNFUlZJQ0VfVVNFUl9QT1NUR1JFUwogICAgICAtIFBPU1RHUkVTX1BBU1NXT1JEPSRTRVJWSUNFX1BBU1NXT1JEX1BPU1RHUkVTCiAgICAgIC0gUE9TVEdSRVNfREI9JHtQT1NUR1JFU19EQjotZG9jdXNlYWx9CiAgICBoZWFsdGhjaGVjazoKICAgICAgdGVzdDogWyJDTUQtU0hFTEwiLCAicGdfaXNyZWFkeSAtVSAkJHtQT1NUR1JFU19VU0VSfSAtZCAkJHtQT1NUR1JFU19EQn0iXQogICAgICBpbnRlcnZhbDogNXMKICAgICAgdGltZW91dDogMjBzCiAgICAgIHJldHJpZXM6IDEw",
         "tags": [
             "documentation"
         ],
@@ -226,7 +226,7 @@
     "docuseal": {
         "documentation": "https:\/\/www.docuseal.co",
         "slogan": "Document Signing for Everyone free forever for individuals, extensible for businesses and developers. Open Source Alternative to DocuSign, PandaDoc and more.",
-        "compose": "c2VydmljZXM6CiAgZG9jdXNlYWw6CiAgICBpbWFnZTogJ2RvY3VzZWFsL2RvY3VzZWFsOmxhdGVzdCcKICAgIGVudmlyb25tZW50OgogICAgICAtIFNFUlZJQ0VfRlFETl9ET0NVU0VBTAogICAgICAtICdIT1NUPSR7U0VSVklDRV9GUUROX0RPQ1VTRUFMfScKICAgIHZvbHVtZXM6CiAgICAgIC0gJ2RvY3VzZWFsLWRhdGE6L2RhdGEnCiAgICBoZWFsdGhjaGVjazoKICAgICAgdGVzdDoKICAgICAgICAtIENNRC1TSEVMTAogICAgICAgIC0gJ3dnZXQgLXFPLSBodHRwOi8vbG9jYWxob3N0OjMwMDAnCiAgICAgIGludGVydmFsOiA1cwogICAgICB0aW1lb3V0OiAyMHMKICAgICAgcmV0cmllczogMTA=",
+        "compose": "c2VydmljZXM6CiAgZG9jdXNlYWw6CiAgICBpbWFnZTogZG9jdXNlYWwvZG9jdXNlYWw6bGF0ZXN0CiAgICBlbnZpcm9ubWVudDoKICAgICAgLSBTRVJWSUNFX0ZRRE5fRE9DVVNFQUwKICAgICAgLSBIT1NUPSR7U0VSVklDRV9GUUROX0RPQ1VTRUFMfQogICAgdm9sdW1lczoKICAgICAgLSBkb2N1c2VhbC1kYXRhOi9kYXRhCiAgICBoZWFsdGhjaGVjazoKICAgICAgdGVzdDogWyJDTUQiLCAiY3VybCIsICItZiIsICJodHRwOi8vbG9jYWxob3N0OjMwMDAiXQogICAgICBpbnRlcnZhbDogNXMKICAgICAgdGltZW91dDogMjBzCiAgICAgIHJldHJpZXM6IDEw",
         "tags": [
             "documentation"
         ],