diff --git a/templates/compose/foundryvtt.yaml b/templates/compose/foundryvtt.yaml
index f1c80d619..5cf961a37 100644
--- a/templates/compose/foundryvtt.yaml
+++ b/templates/compose/foundryvtt.yaml
@@ -10,7 +10,6 @@ services:
     expose:
     - 30000
     environment:
-    # FQDN will be proxied to port 30000
     - SERVICE_FQDN_FOUNDRY_30000
     # Account username or email address for foundryvtt.com. Required for downloading an application distribution.
     - FOUNDRY_USERNAME=${FOUNDRY_USERNAME}
@@ -40,14 +39,12 @@ services:
     - FOUNDRY_MINIFY_STATIC_FILES=${FOUNDRY_MINIFY_STATIC_FILES:-true}
     # The world ID to startup at system start.
     - FOUNDRY_WORLD=${FOUNDRY_WORLD}
-    # Set to true to enable FoundryVTT telemetry, false to disable. This options allows the collection of anonymous usage data to help improve FoundryVTT.
-    - FOUNDRY_TELEMETRY=${FOUNDRY_TELEMETRY}
-    # Container TZ database name
+    - FOUNDRY_TELEMETRY=${FOUNDRY_TELEMETRY:-false}
     - TIMEZONE=${TIMEZONE:-UTC}
     # Set a path to cache downloads of the Foundry distribution archive and speed up subsequent container startups.
     - CONTAINER_CACHE=/data/container_cache
     volumes:
-    - foundryvtt_data:/data
+    - foundryvtt-data:/data
     healthcheck:
       test: ["CMD", "curl", "-f", "http://127.0.0.1:30000"]
       timeout: 5s
diff --git a/templates/service-templates.json b/templates/service-templates.json
index 3ef4cacbb..d9b5e154b 100644
--- a/templates/service-templates.json
+++ b/templates/service-templates.json
@@ -784,6 +784,21 @@
         "minversion": "0.0.0",
         "port": "3000"
     },
+    "foundryvtt": {
+        "documentation": "https://foundryvtt.com/kb/?utm_source=coolify.io",
+        "slogan": "Foundry Virtual Tabletop is a self-hosted & modern roleplaying platform",
+        "compose": "c2VydmljZXM6CiAgZm91bmRyeXZ0dDoKICAgIGltYWdlOiAnZmVsZGR5L2ZvdW5kcnl2dHQ6cmVsZWFzZScKICAgIGV4cG9zZToKICAgICAgLSAzMDAwMAogICAgZW52aXJvbm1lbnQ6CiAgICAgIC0gU0VSVklDRV9GUUROX0ZPVU5EUllfMzAwMDAKICAgICAgLSAnRk9VTkRSWV9VU0VSTkFNRT0ke0ZPVU5EUllfVVNFUk5BTUV9JwogICAgICAtICdGT1VORFJZX1BBU1NXT1JEPSR7Rk9VTkRSWV9QQVNTV09SRH0nCiAgICAgIC0gJ0ZPVU5EUllfUkVMRUFTRV9VUkw9JHtGT1VORFJZX1JFTEVBU0VfVVJMfScKICAgICAgLSAnRk9VTkRSWV9MSUNFTlNFX0tFWT0ke0ZPVU5EUllfTElDRU5TRV9LRVl9JwogICAgICAtICdGT1VORFJZX0FETUlOX0tFWT0ke0ZPVU5EUllfQURNSU46LWF0cm9wb3N9JwogICAgICAtICdGT1VORFJZX0hPU1ROQU1FPSR7Rk9VTkRSWV9IT1NUTkFNRX0nCiAgICAgIC0gJ0ZPVU5EUllfUk9VVEVfUFJFRklYPSR7Rk9VTkRSWV9ST1VURV9QUkVGSVh9JwogICAgICAtICdGT1VORFJZX1BST1hZX1BPUlQ9JHtGT1VORFJZX1BST1hZX1BPUlQ6LTgwfScKICAgICAgLSAnRk9VTkRSWV9QUk9YWV9TU0w9JHtGT1VORFJZX1BST1hZX1NTTDotdHJ1ZX0nCiAgICAgIC0gJ0ZPVU5EUllfQVdTX0NPTkZJRz0ke0ZPVU5EUllfQVdTX0NPTkZJR30nCiAgICAgIC0gJ0ZPVU5EUllfTEFOR1VBR0U9JHtGT1VORFJZX0xBTkdVQUdFOi1lbi5jb3JlfScKICAgICAgLSAnRk9VTkRSWV9DU1NfVEhFTUU9JHtGT1VORFJZX0NTU19USEVNRTotZm91bmRyeX0nCiAgICAgIC0gJ0ZPVU5EUllfTUlOSUZZX1NUQVRJQ19GSUxFUz0ke0ZPVU5EUllfTUlOSUZZX1NUQVRJQ19GSUxFUzotdHJ1ZX0nCiAgICAgIC0gJ0ZPVU5EUllfV09STEQ9JHtGT1VORFJZX1dPUkxEfScKICAgICAgLSAnRk9VTkRSWV9URUxFTUVUUlk9JHtGT1VORFJZX1RFTEVNRVRSWTotZmFsc2V9JwogICAgICAtICdUSU1FWk9ORT0ke1RJTUVaT05FOi1VVEN9JwogICAgICAtIENPTlRBSU5FUl9DQUNIRT0vZGF0YS9jb250YWluZXJfY2FjaGUKICAgIHZvbHVtZXM6CiAgICAgIC0gJ2ZvdW5kcnl2dHQtZGF0YTovZGF0YScKICAgIGhlYWx0aGNoZWNrOgogICAgICB0ZXN0OgogICAgICAgIC0gQ01ECiAgICAgICAgLSBjdXJsCiAgICAgICAgLSAnLWYnCiAgICAgICAgLSAnaHR0cDovLzEyNy4wLjAuMTozMDAwMCcKICAgICAgdGltZW91dDogNXMKICAgICAgaW50ZXJ2YWw6IDMwcwogICAgICByZXRyaWVzOiAzCg==",
+        "tags": [
+            "foundryvtt",
+            "foundry",
+            "vtt",
+            "ttrpg",
+            "roleplaying"
+        ],
+        "logo": "svgs/foundryvtt.png",
+        "minversion": "0.0.0",
+        "port": "30000"
+    },
     "freshrss-with-mariadb": {
         "documentation": "https://freshrss.org/index.html?utm_source=coolify.io",
         "slogan": "A free, self-hostable feed aggregator.",