diff --git a/templates/compose/jellyfin.yaml b/templates/compose/jellyfin.yaml
index ab093cc76..47149869f 100644
--- a/templates/compose/jellyfin.yaml
+++ b/templates/compose/jellyfin.yaml
@@ -2,12 +2,13 @@
 # slogan: Jellyfin is a media server for hosting and streaming your media collection.
 # tags: media, server, movies, tv, music
 # logo: svgs/jellyfin.svg
+# port: 8096
 
 services:
   jellyfin:
     image: lscr.io/linuxserver/jellyfin:latest
     environment:
-      - SERVICE_FQDN_JELLYFIN
+      - SERVICE_FQDN_JELLYFIN_8096
       - PUID=1000
       - PGID=1000
       - TZ=Europe/Madrid
diff --git a/templates/compose/kuzzle.yaml b/templates/compose/kuzzle.yaml
index f228e9baf..e62509d82 100644
--- a/templates/compose/kuzzle.yaml
+++ b/templates/compose/kuzzle.yaml
@@ -1,7 +1,7 @@
 # documentation: https://kuzzle.io
 # slogan: Kuzzle is a generic backend offering the basic building blocks common to every application.
 # tags: backend, api, realtime, websocket, mqtt, rest, sdk, iot, geofencing, low-code
-
+# port: 7512
 
 services:
   redis:
diff --git a/templates/compose/mattermost.yaml b/templates/compose/mattermost.yaml
index 2afe9a537..ce3e09531 100644
--- a/templates/compose/mattermost.yaml
+++ b/templates/compose/mattermost.yaml
@@ -5,7 +5,7 @@
 
 services:
   mattermost:
-    image: mattermost/mattermost-team-edition:9.1
+    image: mattermost/mattermost-team-edition:9
     volumes:
       - mattermost-data:/mattermost
     environment:
diff --git a/templates/compose/meilisearch.yaml b/templates/compose/meilisearch.yaml
index 4daab4f9a..6dff24e5d 100644
--- a/templates/compose/meilisearch.yaml
+++ b/templates/compose/meilisearch.yaml
@@ -2,12 +2,13 @@
 # slogan: MeiliSearch is a powerful, fast, easy to use and deploy search engine.
 # tags: search,engine,fulltext,full,text,meilisearch
 # logo: svgs/meilisearch.svg
+# port: 7700
 
 services:
   meilisearch:
     image: getmeili/meilisearch:latest
     environment:
-      - SERVICE_FQDN_MEILISEARCH
+      - SERVICE_FQDN_MEILISEARCH_7700
       - MEILI_NO_ANALYTICS=${MEILI_NO_ANALYTICS:-true}
       - MEILI_ENV=${MEILI_ENV:-production}
       - MEILI_MASTER_KEY=${SERVICE_PASSWORD_MEILISEARCH}
diff --git a/templates/service-templates.json b/templates/service-templates.json
index 2b9838e66..5d8a8c751 100644
--- a/templates/service-templates.json
+++ b/templates/service-templates.json
@@ -393,7 +393,7 @@
     "jellyfin": {
         "documentation": "https:\/\/jellyfin.org",
         "slogan": "Jellyfin is a media server for hosting and streaming your media collection.",
-        "compose": "c2VydmljZXM6CiAgamVsbHlmaW46CiAgICBpbWFnZTogJ2xzY3IuaW8vbGludXhzZXJ2ZXIvamVsbHlmaW46bGF0ZXN0JwogICAgZW52aXJvbm1lbnQ6CiAgICAgIC0gU0VSVklDRV9GUUROX0pFTExZRklOCiAgICAgIC0gUFVJRD0xMDAwCiAgICAgIC0gUEdJRD0xMDAwCiAgICAgIC0gVFo9RXVyb3BlL01hZHJpZAogICAgICAtIEpFTExZRklOX1B1Ymxpc2hlZFNlcnZlclVybD0kU0VSVklDRV9GUUROX0pFTExZRklOCiAgICB2b2x1bWVzOgogICAgICAtICdqZWxseWZpbi1jb25maWc6L2NvbmZpZycKICAgICAgLSAnamVsbHlmaW4tdHZzaG93czovZGF0YS90dnNob3dzJwogICAgICAtICdqZWxseWZpbi1tb3ZpZXM6L2RhdGEvbW92aWVzJwogICAgaGVhbHRoY2hlY2s6CiAgICAgIHRlc3Q6CiAgICAgICAgLSBDTUQKICAgICAgICAtIGN1cmwKICAgICAgICAtICctZicKICAgICAgICAtICdodHRwOi8vbG9jYWxob3N0OjgwOTYnCiAgICAgIGludGVydmFsOiAycwogICAgICB0aW1lb3V0OiAxMHMKICAgICAgcmV0cmllczogMTUK",
+        "compose": "c2VydmljZXM6CiAgamVsbHlmaW46CiAgICBpbWFnZTogJ2xzY3IuaW8vbGludXhzZXJ2ZXIvamVsbHlmaW46bGF0ZXN0JwogICAgZW52aXJvbm1lbnQ6CiAgICAgIC0gU0VSVklDRV9GUUROX0pFTExZRklOXzgwOTYKICAgICAgLSBQVUlEPTEwMDAKICAgICAgLSBQR0lEPTEwMDAKICAgICAgLSBUWj1FdXJvcGUvTWFkcmlkCiAgICAgIC0gSkVMTFlGSU5fUHVibGlzaGVkU2VydmVyVXJsPSRTRVJWSUNFX0ZRRE5fSkVMTFlGSU4KICAgIHZvbHVtZXM6CiAgICAgIC0gJ2plbGx5ZmluLWNvbmZpZzovY29uZmlnJwogICAgICAtICdqZWxseWZpbi10dnNob3dzOi9kYXRhL3R2c2hvd3MnCiAgICAgIC0gJ2plbGx5ZmluLW1vdmllczovZGF0YS9tb3ZpZXMnCiAgICBoZWFsdGhjaGVjazoKICAgICAgdGVzdDoKICAgICAgICAtIENNRAogICAgICAgIC0gY3VybAogICAgICAgIC0gJy1mJwogICAgICAgIC0gJ2h0dHA6Ly9sb2NhbGhvc3Q6ODA5NicKICAgICAgaW50ZXJ2YWw6IDJzCiAgICAgIHRpbWVvdXQ6IDEwcwogICAgICByZXRyaWVzOiAxNQo=",
         "tags": [
             "media",
             "server",
@@ -402,7 +402,8 @@
             "music"
         ],
         "logo": "svgs\/jellyfin.svg",
-        "minversion": "0.0.0"
+        "minversion": "0.0.0",
+        "port": "8096"
     },
     "kuzzle": {
         "documentation": "https:\/\/kuzzle.io",
@@ -421,12 +422,13 @@
             "low-code"
         ],
         "logo": "svgs\/unknown.svg",
-        "minversion": "0.0.0"
+        "minversion": "0.0.0",
+        "port": "7512"
     },
     "meilisearch": {
         "documentation": "https:\/\/www.meilisearch.com",
         "slogan": "MeiliSearch is a powerful, fast, easy to use and deploy search engine.",
-        "compose": "c2VydmljZXM6CiAgbWVpbGlzZWFyY2g6CiAgICBpbWFnZTogJ2dldG1laWxpL21laWxpc2VhcmNoOmxhdGVzdCcKICAgIGVudmlyb25tZW50OgogICAgICAtIFNFUlZJQ0VfRlFETl9NRUlMSVNFQVJDSAogICAgICAtICdNRUlMSV9OT19BTkFMWVRJQ1M9JHtNRUlMSV9OT19BTkFMWVRJQ1M6LXRydWV9JwogICAgICAtICdNRUlMSV9FTlY9JHtNRUlMSV9FTlY6LXByb2R1Y3Rpb259JwogICAgICAtICdNRUlMSV9NQVNURVJfS0VZPSR7U0VSVklDRV9QQVNTV09SRF9NRUlMSVNFQVJDSH0nCiAgICB2b2x1bWVzOgogICAgICAtICdtZWlsaXNlYXJjaC1kYXRhOi9tZWlsaV9kYXRhJwogICAgaGVhbHRoY2hlY2s6CiAgICAgIHRlc3Q6CiAgICAgICAgLSBDTUQKICAgICAgICAtIGN1cmwKICAgICAgICAtICctZicKICAgICAgICAtICdodHRwOi8vbG9jYWxob3N0Ojc3MDAvaGVhbHRoJwogICAgICBpbnRlcnZhbDogMnMKICAgICAgdGltZW91dDogMTBzCiAgICAgIHJldHJpZXM6IDE1Cg==",
+        "compose": "c2VydmljZXM6CiAgbWVpbGlzZWFyY2g6CiAgICBpbWFnZTogJ2dldG1laWxpL21laWxpc2VhcmNoOmxhdGVzdCcKICAgIGVudmlyb25tZW50OgogICAgICAtIFNFUlZJQ0VfRlFETl9NRUlMSVNFQVJDSF83NzAwCiAgICAgIC0gJ01FSUxJX05PX0FOQUxZVElDUz0ke01FSUxJX05PX0FOQUxZVElDUzotdHJ1ZX0nCiAgICAgIC0gJ01FSUxJX0VOVj0ke01FSUxJX0VOVjotcHJvZHVjdGlvbn0nCiAgICAgIC0gJ01FSUxJX01BU1RFUl9LRVk9JHtTRVJWSUNFX1BBU1NXT1JEX01FSUxJU0VBUkNIfScKICAgIHZvbHVtZXM6CiAgICAgIC0gJ21laWxpc2VhcmNoLWRhdGE6L21laWxpX2RhdGEnCiAgICBoZWFsdGhjaGVjazoKICAgICAgdGVzdDoKICAgICAgICAtIENNRAogICAgICAgIC0gY3VybAogICAgICAgIC0gJy1mJwogICAgICAgIC0gJ2h0dHA6Ly9sb2NhbGhvc3Q6NzcwMC9oZWFsdGgnCiAgICAgIGludGVydmFsOiAycwogICAgICB0aW1lb3V0OiAxMHMKICAgICAgcmV0cmllczogMTUK",
         "tags": [
             "search",
             "engine",
@@ -436,7 +438,8 @@
             "meilisearch"
         ],
         "logo": "svgs\/meilisearch.svg",
-        "minversion": "0.0.0"
+        "minversion": "0.0.0",
+        "port": "7700"
     },
     "metabase": {
         "documentation": "https:\/\/www.metabase.com",