diff --git a/templates/compose/jupyterlab.yaml b/templates/compose/jupyterlab.yaml
index 1795dda35..df0d1272e 100644
--- a/templates/compose/jupyterlab.yaml
+++ b/templates/compose/jupyterlab.yaml
@@ -4,21 +4,19 @@
 # logo: svgs/jupyterlab.svg
 # port: 8008
 
-version: '3.8'
-
 services:
   jupyterlab:
     image: yokowasis/jupyterlab
     expose:
       - 8008
     environment:
-      - SERVICE_FQDN_JUPYTERLAB
+      - SERVICE_FQDN_JUPYTERLAB_8008
       - PORT=${PORT:-8008}
       - TOKEN=${SERVICE_PASSWORD_TOKEN}
       - CONDA_PACKAGES=${CONDA_PACKAGES:-pandas numpy matplotlib seaborn scikit-learn pytorch nltk openpyxl category_encoders scikit-learn tensorflow spacy}
       - PIP_PACKAGES=${PIP_PACKAGES:-sastrawi}
     volumes:
-      - jupyterlab_data:/home/mambauser/data
+      - jupyterlab-data:/home/mambauser/data
     healthcheck:
       test:
         [
@@ -29,5 +27,4 @@ services:
         ]
       timeout: 5s
       interval: 5s
-      retries: 3
-      
\ No newline at end of file
+      retries: 5
diff --git a/templates/service-templates.json b/templates/service-templates.json
index ec792847b..27fc67123 100644
--- a/templates/service-templates.json
+++ b/templates/service-templates.json
@@ -1182,6 +1182,22 @@
         "minversion": "0.0.0",
         "port": "22300"
     },
+    "jupyterlab": {
+        "documentation": "https://jupyterlab.readthedocs.io/en/latest/?utm_source=coolify.io",
+        "slogan": "JupyterLab Notebook with C++ (xeus-cling) and Javascript (Deno) Kernel",
+        "compose": "c2VydmljZXM6CiAganVweXRlcmxhYjoKICAgIGltYWdlOiB5b2tvd2FzaXMvanVweXRlcmxhYgogICAgZXhwb3NlOgogICAgICAtIDgwMDgKICAgIGVudmlyb25tZW50OgogICAgICAtIFNFUlZJQ0VfRlFETl9KVVBZVEVSTEFCXzgwMDgKICAgICAgLSAnUE9SVD0ke1BPUlQ6LTgwMDh9JwogICAgICAtICdUT0tFTj0ke1NFUlZJQ0VfUEFTU1dPUkRfVE9LRU59JwogICAgICAtICdDT05EQV9QQUNLQUdFUz0ke0NPTkRBX1BBQ0tBR0VTOi1wYW5kYXMgbnVtcHkgbWF0cGxvdGxpYiBzZWFib3JuIHNjaWtpdC1sZWFybiBweXRvcmNoIG5sdGsgb3BlbnB5eGwgY2F0ZWdvcnlfZW5jb2RlcnMgc2Npa2l0LWxlYXJuIHRlbnNvcmZsb3cgc3BhY3l9JwogICAgICAtICdQSVBfUEFDS0FHRVM9JHtQSVBfUEFDS0FHRVM6LXNhc3RyYXdpfScKICAgIHZvbHVtZXM6CiAgICAgIC0gJ2p1cHl0ZXJsYWItZGF0YTovaG9tZS9tYW1iYXVzZXIvZGF0YScKICAgIGhlYWx0aGNoZWNrOgogICAgICB0ZXN0OgogICAgICAgIC0gQ01ECiAgICAgICAgLSBjdXJsCiAgICAgICAgLSAnLWYnCiAgICAgICAgLSAnaHR0cDovLzEyNy4wLjAuMTo4MDA4L2xvZ2luLycKICAgICAgdGltZW91dDogNXMKICAgICAgaW50ZXJ2YWw6IDVzCiAgICAgIHJldHJpZXM6IDUK",
+        "tags": [
+            "jupyter",
+            "notebook",
+            "python",
+            "cpp",
+            "deno",
+            "jupyterlab"
+        ],
+        "logo": "svgs/jupyterlab.svg",
+        "minversion": "0.0.0",
+        "port": "8008"
+    },
     "keycloak-with-postgres": {
         "documentation": "https://www.keycloak.org?utm_source=coolify.io",
         "slogan": "Keycloak is an open-source Identity and Access Management tool.",