From c85c697e80aec2789b259e5d2d9afe5c177f758a Mon Sep 17 00:00:00 2001
From: Andras Bacsai <5845193+andrasbacsai@users.noreply.github.com>
Date: Thu, 1 Oct 2026 20:31:00 +0200
Subject: [PATCH] fix(templates): remove duplicate Homarr key and quoted
 Bulwark values

Homarr set SECRET_ENCRYPTION_KEY twice; only the
SERVICE_HEX_64_HOMARR line was ever used, so the duplicate is removed
and existing keys do not change. Bulwark quoted list-syntax values, so
the quotes reached the container and JMAP_SERVER_URL was never created
as a required variable. Existing services keep their stored compose.
---
 templates/compose/bulwark.yaml          | 4 ++--
 templates/compose/homarr.yaml           | 1 -
 templates/service-templates-latest.json | 4 ++--
 templates/service-templates.json        | 4 ++--
 4 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/templates/compose/bulwark.yaml b/templates/compose/bulwark.yaml
index 13e188260d..d79e89ada5 100644
--- a/templates/compose/bulwark.yaml
+++ b/templates/compose/bulwark.yaml
@@ -10,8 +10,8 @@ services:
     image: 'ghcr.io/bulwarkmail/webmail:v1.8.1'
     environment:
       - SERVICE_URL_BULWARK_3000
-      - JMAP_SERVER_URL='${JMAP_SERVER_URL:?}'
-      - SESSION_SECRET='${SERVICE_HEX_64_BULWARK}'
+      - JMAP_SERVER_URL=${JMAP_SERVER_URL:?}
+      - SESSION_SECRET=${SERVICE_HEX_64_BULWARK}
     volumes:
       - 'bulwark-config:/app/data/admin'
       - 'bulwark-state:/app/data/admin-state'
diff --git a/templates/compose/homarr.yaml b/templates/compose/homarr.yaml
index 82fb46e322..7fa3e8917d 100644
--- a/templates/compose/homarr.yaml
+++ b/templates/compose/homarr.yaml
@@ -9,7 +9,6 @@ services:
   homarr:
     image: ghcr.io/homarr-labs/homarr:v1.74.0
     environment:
-      - SECRET_ENCRYPTION_KEY=$SERVICE_HEX_64_ENCRYPTION
       - SERVICE_URL_HOMARR_7575
       - 'SECRET_ENCRYPTION_KEY=${SERVICE_HEX_64_HOMARR}'
     volumes:
diff --git a/templates/service-templates-latest.json b/templates/service-templates-latest.json
index f79602212c..5c172edacc 100644
--- a/templates/service-templates-latest.json
+++ b/templates/service-templates-latest.json
@@ -443,7 +443,7 @@
     "bulwark": {
         "documentation": "https://bulwarkmail.org/docs?utm_source=coolify.io",
         "slogan": "Modern webmail platform",
-        "compose": "c2VydmljZXM6CiAgYnVsd2FyazoKICAgIGltYWdlOiAnZ2hjci5pby9idWx3YXJrbWFpbC93ZWJtYWlsOnYxLjguMScKICAgIGVudmlyb25tZW50OgogICAgICAtIFNFUlZJQ0VfVVJMX0JVTFdBUktfMzAwMAogICAgICAtICJKTUFQX1NFUlZFUl9VUkw9JyR7Sk1BUF9TRVJWRVJfVVJMOj99JyIKICAgICAgLSAiU0VTU0lPTl9TRUNSRVQ9JyR7U0VSVklDRV9IRVhfNjRfQlVMV0FSS30nIgogICAgdm9sdW1lczoKICAgICAgLSAnYnVsd2Fyay1jb25maWc6L2FwcC9kYXRhL2FkbWluJwogICAgICAtICdidWx3YXJrLXN0YXRlOi9hcHAvZGF0YS9hZG1pbi1zdGF0ZScKICAgIGhlYWx0aGNoZWNrOgogICAgICB0ZXN0OgogICAgICAgIC0gQ01ECiAgICAgICAgLSB3Z2V0CiAgICAgICAgLSAnLS1uby12ZXJib3NlJwogICAgICAgIC0gJy0tdHJpZXM9MScKICAgICAgICAtICctLXNwaWRlcicKICAgICAgICAtICdodHRwOi8vMTI3LjAuMC4xOjMwMDAvYXBpL2hlYWx0aCcKICAgICAgaW50ZXJ2YWw6IDMwcwogICAgICB0aW1lb3V0OiA1cwogICAgICByZXRyaWVzOiAzCiAgICAgIHN0YXJ0X3BlcmlvZDogMTBzCg==",
+        "compose": "c2VydmljZXM6CiAgYnVsd2FyazoKICAgIGltYWdlOiAnZ2hjci5pby9idWx3YXJrbWFpbC93ZWJtYWlsOnYxLjguMScKICAgIGVudmlyb25tZW50OgogICAgICAtIFNFUlZJQ0VfVVJMX0JVTFdBUktfMzAwMAogICAgICAtICdKTUFQX1NFUlZFUl9VUkw9JHtKTUFQX1NFUlZFUl9VUkw6P30nCiAgICAgIC0gJ1NFU1NJT05fU0VDUkVUPSR7U0VSVklDRV9IRVhfNjRfQlVMV0FSS30nCiAgICB2b2x1bWVzOgogICAgICAtICdidWx3YXJrLWNvbmZpZzovYXBwL2RhdGEvYWRtaW4nCiAgICAgIC0gJ2J1bHdhcmstc3RhdGU6L2FwcC9kYXRhL2FkbWluLXN0YXRlJwogICAgaGVhbHRoY2hlY2s6CiAgICAgIHRlc3Q6CiAgICAgICAgLSBDTUQKICAgICAgICAtIHdnZXQKICAgICAgICAtICctLW5vLXZlcmJvc2UnCiAgICAgICAgLSAnLS10cmllcz0xJwogICAgICAgIC0gJy0tc3BpZGVyJwogICAgICAgIC0gJ2h0dHA6Ly8xMjcuMC4wLjE6MzAwMC9hcGkvaGVhbHRoJwogICAgICBpbnRlcnZhbDogMzBzCiAgICAgIHRpbWVvdXQ6IDVzCiAgICAgIHJldHJpZXM6IDMKICAgICAgc3RhcnRfcGVyaW9kOiAxMHMK",
         "tags": [
             "mail",
             "webmail",
@@ -2371,7 +2371,7 @@
     "homarr": {
         "documentation": "https://homarr.dev?utm_source=coolify.io",
         "slogan": "Homarr is a self-hosted homepage for your services.",
-        "compose": "c2VydmljZXM6CiAgaG9tYXJyOgogICAgaW1hZ2U6ICdnaGNyLmlvL2hvbWFyci1sYWJzL2hvbWFycjp2MS43NC4wJwogICAgZW52aXJvbm1lbnQ6CiAgICAgIC0gU0VDUkVUX0VOQ1JZUFRJT05fS0VZPSRTRVJWSUNFX0hFWF82NF9FTkNSWVBUSU9OCiAgICAgIC0gU0VSVklDRV9VUkxfSE9NQVJSXzc1NzUKICAgICAgLSAnU0VDUkVUX0VOQ1JZUFRJT05fS0VZPSR7U0VSVklDRV9IRVhfNjRfSE9NQVJSfScKICAgIHZvbHVtZXM6CiAgICAgIC0gJy92YXIvcnVuL2RvY2tlci5zb2NrOi92YXIvcnVuL2RvY2tlci5zb2NrJwogICAgICAtICcuL2hvbWFyci9hcHBkYXRhOi9hcHBkYXRhJwogICAgaGVhbHRoY2hlY2s6CiAgICAgIHRlc3Q6CiAgICAgICAgLSBDTUQKICAgICAgICAtIHdnZXQKICAgICAgICAtICctcScKICAgICAgICAtICctLXNwaWRlcicKICAgICAgICAtICdodHRwOi8vMTI3LjAuMC4xOjc1NzUnCiAgICAgIGludGVydmFsOiA1cwogICAgICB0aW1lb3V0OiAyMHMKICAgICAgcmV0cmllczogMTAK",
+        "compose": "c2VydmljZXM6CiAgaG9tYXJyOgogICAgaW1hZ2U6ICdnaGNyLmlvL2hvbWFyci1sYWJzL2hvbWFycjp2MS43NC4wJwogICAgZW52aXJvbm1lbnQ6CiAgICAgIC0gU0VSVklDRV9VUkxfSE9NQVJSXzc1NzUKICAgICAgLSAnU0VDUkVUX0VOQ1JZUFRJT05fS0VZPSR7U0VSVklDRV9IRVhfNjRfSE9NQVJSfScKICAgIHZvbHVtZXM6CiAgICAgIC0gJy92YXIvcnVuL2RvY2tlci5zb2NrOi92YXIvcnVuL2RvY2tlci5zb2NrJwogICAgICAtICcuL2hvbWFyci9hcHBkYXRhOi9hcHBkYXRhJwogICAgaGVhbHRoY2hlY2s6CiAgICAgIHRlc3Q6CiAgICAgICAgLSBDTUQKICAgICAgICAtIHdnZXQKICAgICAgICAtICctcScKICAgICAgICAtICctLXNwaWRlcicKICAgICAgICAtICdodHRwOi8vMTI3LjAuMC4xOjc1NzUnCiAgICAgIGludGVydmFsOiA1cwogICAgICB0aW1lb3V0OiAyMHMKICAgICAgcmV0cmllczogMTAK",
         "tags": [
             "homarr",
             "self-hosted",
diff --git a/templates/service-templates.json b/templates/service-templates.json
index 241bb4b849..87a6e2d3b4 100644
--- a/templates/service-templates.json
+++ b/templates/service-templates.json
@@ -443,7 +443,7 @@
     "bulwark": {
         "documentation": "https://bulwarkmail.org/docs?utm_source=coolify.io",
         "slogan": "Modern webmail platform",
-        "compose": "c2VydmljZXM6CiAgYnVsd2FyazoKICAgIGltYWdlOiAnZ2hjci5pby9idWx3YXJrbWFpbC93ZWJtYWlsOnYxLjguMScKICAgIGVudmlyb25tZW50OgogICAgICAtIFNFUlZJQ0VfRlFETl9CVUxXQVJLXzMwMDAKICAgICAgLSAiSk1BUF9TRVJWRVJfVVJMPScke0pNQVBfU0VSVkVSX1VSTDo/fSciCiAgICAgIC0gIlNFU1NJT05fU0VDUkVUPScke1NFUlZJQ0VfSEVYXzY0X0JVTFdBUkt9JyIKICAgIHZvbHVtZXM6CiAgICAgIC0gJ2J1bHdhcmstY29uZmlnOi9hcHAvZGF0YS9hZG1pbicKICAgICAgLSAnYnVsd2Fyay1zdGF0ZTovYXBwL2RhdGEvYWRtaW4tc3RhdGUnCiAgICBoZWFsdGhjaGVjazoKICAgICAgdGVzdDoKICAgICAgICAtIENNRAogICAgICAgIC0gd2dldAogICAgICAgIC0gJy0tbm8tdmVyYm9zZScKICAgICAgICAtICctLXRyaWVzPTEnCiAgICAgICAgLSAnLS1zcGlkZXInCiAgICAgICAgLSAnaHR0cDovLzEyNy4wLjAuMTozMDAwL2FwaS9oZWFsdGgnCiAgICAgIGludGVydmFsOiAzMHMKICAgICAgdGltZW91dDogNXMKICAgICAgcmV0cmllczogMwogICAgICBzdGFydF9wZXJpb2Q6IDEwcwo=",
+        "compose": "c2VydmljZXM6CiAgYnVsd2FyazoKICAgIGltYWdlOiAnZ2hjci5pby9idWx3YXJrbWFpbC93ZWJtYWlsOnYxLjguMScKICAgIGVudmlyb25tZW50OgogICAgICAtIFNFUlZJQ0VfRlFETl9CVUxXQVJLXzMwMDAKICAgICAgLSAnSk1BUF9TRVJWRVJfVVJMPSR7Sk1BUF9TRVJWRVJfVVJMOj99JwogICAgICAtICdTRVNTSU9OX1NFQ1JFVD0ke1NFUlZJQ0VfSEVYXzY0X0JVTFdBUkt9JwogICAgdm9sdW1lczoKICAgICAgLSAnYnVsd2Fyay1jb25maWc6L2FwcC9kYXRhL2FkbWluJwogICAgICAtICdidWx3YXJrLXN0YXRlOi9hcHAvZGF0YS9hZG1pbi1zdGF0ZScKICAgIGhlYWx0aGNoZWNrOgogICAgICB0ZXN0OgogICAgICAgIC0gQ01ECiAgICAgICAgLSB3Z2V0CiAgICAgICAgLSAnLS1uby12ZXJib3NlJwogICAgICAgIC0gJy0tdHJpZXM9MScKICAgICAgICAtICctLXNwaWRlcicKICAgICAgICAtICdodHRwOi8vMTI3LjAuMC4xOjMwMDAvYXBpL2hlYWx0aCcKICAgICAgaW50ZXJ2YWw6IDMwcwogICAgICB0aW1lb3V0OiA1cwogICAgICByZXRyaWVzOiAzCiAgICAgIHN0YXJ0X3BlcmlvZDogMTBzCg==",
         "tags": [
             "mail",
             "webmail",
@@ -2371,7 +2371,7 @@
     "homarr": {
         "documentation": "https://homarr.dev?utm_source=coolify.io",
         "slogan": "Homarr is a self-hosted homepage for your services.",
-        "compose": "c2VydmljZXM6CiAgaG9tYXJyOgogICAgaW1hZ2U6ICdnaGNyLmlvL2hvbWFyci1sYWJzL2hvbWFycjp2MS43NC4wJwogICAgZW52aXJvbm1lbnQ6CiAgICAgIC0gU0VDUkVUX0VOQ1JZUFRJT05fS0VZPSRTRVJWSUNFX0hFWF82NF9FTkNSWVBUSU9OCiAgICAgIC0gU0VSVklDRV9GUUROX0hPTUFSUl83NTc1CiAgICAgIC0gJ1NFQ1JFVF9FTkNSWVBUSU9OX0tFWT0ke1NFUlZJQ0VfSEVYXzY0X0hPTUFSUn0nCiAgICB2b2x1bWVzOgogICAgICAtICcvdmFyL3J1bi9kb2NrZXIuc29jazovdmFyL3J1bi9kb2NrZXIuc29jaycKICAgICAgLSAnLi9ob21hcnIvYXBwZGF0YTovYXBwZGF0YScKICAgIGhlYWx0aGNoZWNrOgogICAgICB0ZXN0OgogICAgICAgIC0gQ01ECiAgICAgICAgLSB3Z2V0CiAgICAgICAgLSAnLXEnCiAgICAgICAgLSAnLS1zcGlkZXInCiAgICAgICAgLSAnaHR0cDovLzEyNy4wLjAuMTo3NTc1JwogICAgICBpbnRlcnZhbDogNXMKICAgICAgdGltZW91dDogMjBzCiAgICAgIHJldHJpZXM6IDEwCg==",
+        "compose": "c2VydmljZXM6CiAgaG9tYXJyOgogICAgaW1hZ2U6ICdnaGNyLmlvL2hvbWFyci1sYWJzL2hvbWFycjp2MS43NC4wJwogICAgZW52aXJvbm1lbnQ6CiAgICAgIC0gU0VSVklDRV9GUUROX0hPTUFSUl83NTc1CiAgICAgIC0gJ1NFQ1JFVF9FTkNSWVBUSU9OX0tFWT0ke1NFUlZJQ0VfSEVYXzY0X0hPTUFSUn0nCiAgICB2b2x1bWVzOgogICAgICAtICcvdmFyL3J1bi9kb2NrZXIuc29jazovdmFyL3J1bi9kb2NrZXIuc29jaycKICAgICAgLSAnLi9ob21hcnIvYXBwZGF0YTovYXBwZGF0YScKICAgIGhlYWx0aGNoZWNrOgogICAgICB0ZXN0OgogICAgICAgIC0gQ01ECiAgICAgICAgLSB3Z2V0CiAgICAgICAgLSAnLXEnCiAgICAgICAgLSAnLS1zcGlkZXInCiAgICAgICAgLSAnaHR0cDovLzEyNy4wLjAuMTo3NTc1JwogICAgICBpbnRlcnZhbDogNXMKICAgICAgdGltZW91dDogMjBzCiAgICAgIHJldHJpZXM6IDEwCg==",
         "tags": [
             "homarr",
             "self-hosted",