diff --git a/templates/compose/bluesky-pds.yaml b/templates/compose/bluesky-pds.yaml
index 7d2804421..099380826 100644
--- a/templates/compose/bluesky-pds.yaml
+++ b/templates/compose/bluesky-pds.yaml
@@ -10,7 +10,7 @@ services:
     volumes:
       - ./pds-data:/pds
     environment:
-      - SERVICE_FQDN_PDS_3000
+      - SERVICE_URL_PDS_3000
       - PDS_HOSTNAME=${SERVICE_URL_PDS}
       - PDS_JWT_SECRET=${SERVICE_PASSWORD_JWT_SECRET}
       - PDS_ADMIN_PASSWORD=${SERVICE_PASSWORD_ADMIN}
diff --git a/templates/service-templates-latest.json b/templates/service-templates-latest.json
index 53545e2fd..87946460f 100644
--- a/templates/service-templates-latest.json
+++ b/templates/service-templates-latest.json
@@ -203,6 +203,19 @@
         "logo": "svgs/bitcoin.svg",
         "minversion": "0.0.0"
     },
+    "bluesky-pds": {
+        "documentation": "https://github.com/bluesky-social/pds?utm_source=coolify.io",
+        "slogan": "Bluesky PDS (Personal Data Server)",
+        "compose": "c2VydmljZXM6CiAgcGRzOgogICAgaW1hZ2U6ICdnaGNyLmlvL2JsdWVza3ktc29jaWFsL3BkczpsYXRlc3QnCiAgICB2b2x1bWVzOgogICAgICAtICcuL3Bkcy1kYXRhOi9wZHMnCiAgICBlbnZpcm9ubWVudDoKICAgICAgLSBTRVJWSUNFX1VSTF9QRFNfMzAwMAogICAgICAtICdQRFNfSE9TVE5BTUU9JHtTRVJWSUNFX1VSTF9QRFN9JwogICAgICAtICdQRFNfSldUX1NFQ1JFVD0ke1NFUlZJQ0VfUEFTU1dPUkRfSldUX1NFQ1JFVH0nCiAgICAgIC0gJ1BEU19BRE1JTl9QQVNTV09SRD0ke1NFUlZJQ0VfUEFTU1dPUkRfQURNSU59JwogICAgICAtICdQRFNfQURNSU5fRU1BSUw9JHtTRVJWSUNFX0VNQUlMX0FETUlOfScKICAgICAgLSAnUERTX1BMQ19ST1RBVElPTl9LRVlfSzI1Nl9QUklWQVRFX0tFWV9IRVg9JHtQRFNfUExDX1JPVEFUSU9OX0tFWV9LMjU2X1BSSVZBVEVfS0VZX0hFWH0nCiAgICAgIC0gJ1BEU19EQVRBX0RJUkVDVE9SWT0ke1BEU19EQVRBX0RJUkVDVE9SWTotL3Bkc30nCiAgICAgIC0gJ1BEU19CTE9CU1RPUkVfRElTS19MT0NBVElPTj0ke1BEU19EQVRBX0RJUkVDVE9SWTotL3Bkc30vYmxvY2tzJwogICAgICAtICdQRFNfQkxPQl9VUExPQURfTElNSVQ9JHtQRFNfQkxPQl9VUExPQURfTElNSVQ6LTUyNDI4ODAwfScKICAgICAgLSAnUERTX0RJRF9QTENfVVJMPSR7UERTX0RJRF9QTENfVVJMOi1odHRwczovL3BsYy5kaXJlY3Rvcnl9JwogICAgICAtICdQRFNfQlNLWV9BUFBfVklFV19VUkw9JHtQRFNfQlNLWV9BUFBfVklFV19VUkw6LWh0dHBzOi8vYXBpLmJza3kuYXBwfScKICAgICAgLSAnUERTX0JTS1lfQVBQX1ZJRVdfRElEPSR7UERTX0JTS1lfQVBQX1ZJRVdfRElEOi1kaWQ6d2ViOmFwaS5ic2t5LmFwcH0nCiAgICAgIC0gJ1BEU19SRVBPUlRfU0VSVklDRV9VUkw9JHtQRFNfUkVQT1JUX1NFUlZJQ0VfVVJMOi1odHRwczovL21vZC5ic2t5LmFwcC94cnBjL2NvbS5hdHByb3RvLm1vZGVyYXRpb24uY3JlYXRlUmVwb3J0fScKICAgICAgLSAnUERTX1JFUE9SVF9TRVJWSUNFX0RJRD0ke1BEU19SRVBPUlRfU0VSVklDRV9ESUQ6LWRpZDpwbGM6YXI3YzRieTQ2cWpkeWRoZGV2dnJuZGFjfScKICAgICAgLSAnUERTX0NSQVdMRVJTPSR7UERTX0NSQVdMRVJTOi1odHRwczovL2Jza3kubmV0d29ya30nCiAgICAgIC0gJ0xPR19FTkFCTEVEPSR7TE9HX0VOQUJMRUQ6LXRydWV9JwogICAgY29tbWFuZDogInNoIC1jICdcbiAgZWNobyBcIkluc3RhbGxpbmcgY3VybCwgYmFzaCwgYW5kIHBkc2FkbWluLi4uXCJcbiAgYXBrIGFkZCAtLW5vLWNhY2hlIGN1cmwgYmFzaCAmJiBcXFxuICBjdXJsIC1vIC91c3IvbG9jYWwvYmluL3Bkc2FkbWluLnNoIGh0dHBzOi8vcmF3LmdpdGh1YnVzZXJjb250ZW50LmNvbS9ibHVlc2t5LXNvY2lhbC9wZHMvbWFpbi9wZHNhZG1pbi5zaCAmJiBcXFxuICBjaG1vZCAreCAvdXNyL2xvY2FsL2Jpbi9wZHNhZG1pbi5zaCAmJiBcXFxuICBsbiAtc2YgL3Vzci9sb2NhbC9iaW4vcGRzYWRtaW4uc2ggL3Vzci9sb2NhbC9iaW4vcGRzYWRtaW5cblxuICBlY2hvIFwiR2VuZXJhdGluZyAvcGRzL3Bkcy5lbnYuLi5cIlxuICBwcmludGYgXCIlc1xcblwiIFxcXG4gIFwiU0VSVklDRV9GUUROX1BEU18zMDAwPSQke1NFUlZJQ0VfRlFETl9QRFNfMzAwMH1cIiBcXFxuICBcIlBEU19IT1NUTkFNRT0kJHtQRFNfSE9TVE5BTUV9XCIgXFxcbiAgXCJQRFNfSldUX1NFQ1JFVD0kJHtQRFNfSldUX1NFQ1JFVH1cIiBcXFxuICBcIlBEU19BRE1JTl9QQVNTV09SRD0kJHtQRFNfQURNSU5fUEFTU1dPUkR9XCIgXFxcbiAgXCJQRFNfQURNSU5fRU1BSUw9JCR7UERTX0FETUlOX0VNQUlMfVwiIFxcXG4gIFwiUERTX1BMQ19ST1RBVElPTl9LRVlfSzI1Nl9QUklWQVRFX0tFWV9IRVg9JCR7UERTX1BMQ19ST1RBVElPTl9LRVlfSzI1Nl9QUklWQVRFX0tFWV9IRVh9XCIgXFxcbiAgXCJQRFNfREFUQV9ESVJFQ1RPUlk9JCR7UERTX0RBVEFfRElSRUNUT1JZfVwiIFxcXG4gIFwiUERTX0JMT0JTVE9SRV9ESVNLX0xPQ0FUSU9OPSQke1BEU19EQVRBX0RJUkVDVE9SWX0vYmxvY2tzXCIgXFxcbiAgXCJQRFNfQkxPQl9VUExPQURfTElNSVQ9JCR7UERTX0JMT0JfVVBMT0FEX0xJTUlUfVwiIFxcXG4gIFwiUERTX0RJRF9QTENfVVJMPSQke1BEU19ESURfUExDX1VSTH1cIiBcXFxuICBcIlBEU19CU0tZX0FQUF9WSUVXX1VSTD0kJHtQRFNfQlNLWV9BUFBfVklFV19VUkx9XCIgXFxcbiAgXCJQRFNfQlNLWV9BUFBfVklFV19ESUQ9JCR7UERTX0JTS1lfQVBQX1ZJRVdfRElEfVwiIFxcXG4gIFwiUERTX1JFUE9SVF9TRVJWSUNFX1VSTD0kJHtQRFNfUkVQT1JUX1NFUlZJQ0VfVVJMfVwiIFxcXG4gIFwiUERTX1JFUE9SVF9TRVJWSUNFX0RJRD0kJHtQRFNfUkVQT1JUX1NFUlZJQ0VfRElEfVwiIFxcXG4gIFwiUERTX0NSQVdMRVJTPSQke1BEU19DUkFXTEVSU31cIiBcXFxuICBcIkxPR19FTkFCTEVEPSQke0xPR19FTkFCTEVEfVwiIFxcXG4gID4gL3Bkcy9wZHMuZW52XG5cbiAgZWNobyBcIkxhdW5jaGluZyBQRFMuLi5cIlxuICBleGVjIG5vZGUgLS1lbmFibGUtc291cmNlLW1hcHMgaW5kZXguanNcbidcbiIKICAgIGhlYWx0aGNoZWNrOgogICAgICB0ZXN0OgogICAgICAgIC0gQ01ECiAgICAgICAgLSB3Z2V0CiAgICAgICAgLSAnLS1zcGlkZXInCiAgICAgICAgLSAnaHR0cDovLzEyNy4wLjAuMTozMDAwL3hycGMvX2hlYWx0aCcKICAgICAgaW50ZXJ2YWw6IDJzCiAgICAgIHRpbWVvdXQ6IDEwcwogICAgICByZXRyaWVzOiAxMAo=",
+        "tags": [
+            "bluesky",
+            "pds",
+            "platform"
+        ],
+        "logo": "svgs/bluesky.svg",
+        "minversion": "0.0.0",
+        "port": "3000"
+    },
     "bookstack": {
         "documentation": "https://www.bookstackapp.com/docs/?utm_source=coolify.io",
         "slogan": "BookStack is a simple, self-hosted, easy-to-use platform for organising and storing information",