diff --git a/templates/compose/lowcoder.yaml b/templates/compose/lowcoder.yaml
index 8393ee58a..7cf10b99f 100644
--- a/templates/compose/lowcoder.yaml
+++ b/templates/compose/lowcoder.yaml
@@ -10,10 +10,10 @@ services:
     environment:
       - SERVICE_FQDN_LOWCODER_3000
       - LOWCODER_EMAIL_SIGNUP_ENABLED=${LOWCODER_EMAIL_SIGNUP_ENABLED:-true}
-      - LOWCODER_DB_ENCRYPTION_PASSWORD=$SERVICE_PASSWORD_ENCRYPTION
-      - LOWCODER_DB_ENCRYPTION_SALT=$SERVICE_PASSWORD_SALT
+      - LOWCODER_DB_ENCRYPTION_PASSWORD=${SERVICE_PASSWORD_ENCRYPTION}
+      - LOWCODER_DB_ENCRYPTION_SALT=${SERVICE_PASSWORD_SALT}
     volumes:
-      - lowcoder-data:/lowcoder-stacks
+      - lowcoder_data:/lowcoder-stacks
     healthcheck:
       test: ["CMD", "curl", "-f", "http://127.0.0.1:3000/health"]
       interval: 5s
diff --git a/templates/service-templates.json b/templates/service-templates.json
index 080e263df..4de2e70e6 100644
--- a/templates/service-templates.json
+++ b/templates/service-templates.json
@@ -1690,6 +1690,25 @@
         "logo": "svgs/logto_dark.svg",
         "minversion": "0.0.0"
     },
+    "lowcoder": {
+        "documentation": "https://docs.lowcoder.cloud/?utm_source=coolify.io",
+        "slogan": "Lowcoder (forked from OpenBlocks) is a self-hosted, open-source, low-code platform for building internal tools.",
+        "compose": "c2VydmljZXM6CiAgbG93Y29kZXI6CiAgICBpbWFnZTogbG93Y29kZXJvcmcvbG93Y29kZXItY2UKICAgIGVudmlyb25tZW50OgogICAgICAtIFNFUlZJQ0VfRlFETl9MT1dDT0RFUl8zMDAwCiAgICAgIC0gJ0xPV0NPREVSX0VNQUlMX1NJR05VUF9FTkFCTEVEPSR7TE9XQ09ERVJfRU1BSUxfU0lHTlVQX0VOQUJMRUQ6LXRydWV9JwogICAgICAtICdMT1dDT0RFUl9EQl9FTkNSWVBUSU9OX1BBU1NXT1JEPSR7U0VSVklDRV9QQVNTV09SRF9FTkNSWVBUSU9OfScKICAgICAgLSAnTE9XQ09ERVJfREJfRU5DUllQVElPTl9TQUxUPSR7U0VSVklDRV9QQVNTV09SRF9TQUxUfScKICAgIHZvbHVtZXM6CiAgICAgIC0gJ2xvd2NvZGVyX2RhdGE6L2xvd2NvZGVyLXN0YWNrcycKICAgIGhlYWx0aGNoZWNrOgogICAgICB0ZXN0OgogICAgICAgIC0gQ01ECiAgICAgICAgLSBjdXJsCiAgICAgICAgLSAnLWYnCiAgICAgICAgLSAnaHR0cDovLzEyNy4wLjAuMTozMDAwL2hlYWx0aCcKICAgICAgaW50ZXJ2YWw6IDVzCiAgICAgIHRpbWVvdXQ6IDIwcwogICAgICByZXRyaWVzOiAxMAo=",
+        "tags": [
+            "lowcoder",
+            "openblocks",
+            "low",
+            "code",
+            "platform",
+            "open",
+            "source",
+            "low",
+            "code"
+        ],
+        "logo": "svgs/lowcoder.svg",
+        "minversion": "0.0.0",
+        "port": "3000"
+    },
     "mailpit": {
         "documentation": "https://mailpit.axllent.org/docs/?utm_source=coolify.io",
         "slogan": "Email & SMTP testing tool with API for developers",
@@ -2201,24 +2220,6 @@
         "minversion": "0.0.0",
         "port": "6610"
     },
-    "openblocks": {
-        "documentation": "https://openblocks.dev?utm_source=coolify.io",
-        "slogan": "OpenBlocks is a self-hosted, open-source, low-code platform for building internal tools.",
-        "compose": "c2VydmljZXM6CiAgb3BlbmJsb2NrczoKICAgIGltYWdlOiBvcGVuYmxvY2tzZGV2L29wZW5ibG9ja3MtY2UKICAgIGVudmlyb25tZW50OgogICAgICAtIFNFUlZJQ0VfRlFETl9PUEVOQkxPQ0tTXzMwMDAKICAgICAgLSAnRU5BQkxFX1VTRVJfU0lHTl9VUD0ke0VOQUJMRV9VU0VSX1NJR05fVVA6LXRydWV9JwogICAgICAtIEVOQ1JZUFRJT05fUEFTU1dPUkQ9JFNFUlZJQ0VfUEFTU1dPUkRfRU5DUllQVElPTgogICAgICAtIEVOQ1JZUFRJT05fU0FMVD0kU0VSVklDRV9QQVNTV09SRF9TQUxUCiAgICB2b2x1bWVzOgogICAgICAtICdvcGVuYmxvY2tzLWRhdGE6L29wZW5ibG9ja3Mtc3RhY2tzJwogICAgaGVhbHRoY2hlY2s6CiAgICAgIHRlc3Q6CiAgICAgICAgLSBDTUQKICAgICAgICAtIGN1cmwKICAgICAgICAtICctZicKICAgICAgICAtICdodHRwOi8vMTI3LjAuMC4xOjMwMDAvaGVhbHRoJwogICAgICBpbnRlcnZhbDogNXMKICAgICAgdGltZW91dDogMjBzCiAgICAgIHJldHJpZXM6IDEwCg==",
-        "tags": [
-            "openblocks",
-            "low",
-            "code",
-            "platform",
-            "open",
-            "source",
-            "low",
-            "code"
-        ],
-        "logo": "svgs/openblocks.svg",
-        "minversion": "0.0.0",
-        "port": "3000"
-    },
     "organizr": {
         "documentation": "https://docs.organizr.app/?utm_source=coolify.io",
         "slogan": "Homelab Services Organizer",