diff --git a/blueprints/gel/docker-compose.yml b/blueprints/gel/docker-compose.yml
index 2861e762..24890911 100644
--- a/blueprints/gel/docker-compose.yml
+++ b/blueprints/gel/docker-compose.yml
@@ -9,6 +9,8 @@ services:
       - GEL_SERVER_SECURITY=${GEL_SERVER_SECURITY}
       - GEL_SERVER_PASSWORD=${GEL_SERVER_PASSWORD}
       - GEL_SERVER_TLS_CERT_MODE=generate_self_signed
+      - GEL_SERVER_HTTP_ENDPOINT_SECURITY=optional
+      - GEL_SERVER_ADMIN_UI=enabled
     volumes:
       - gel-data:/var/lib/gel/data
 
diff --git a/blueprints/gel/template.toml b/blueprints/gel/template.toml
index 6a8f65fb..fc06305a 100644
--- a/blueprints/gel/template.toml
+++ b/blueprints/gel/template.toml
@@ -8,6 +8,7 @@ gel_security = "strict"
 serviceName = "gel"
 port = 5656
 host = "${main_domain}"
+path = "/ui"
 
 [config.env]
 GEL_SERVER_PASSWORD = "${gel_password}"
diff --git a/blueprints/keydb/docker-compose.yml b/blueprints/keydb/docker-compose.yml
index 2519c36c..031b4592 100644
--- a/blueprints/keydb/docker-compose.yml
+++ b/blueprints/keydb/docker-compose.yml
@@ -3,8 +3,6 @@ services:
   keydb:
     image: eqalpha/keydb:latest
     restart: unless-stopped
-    ports:
-      - 6379
     command: keydb-server /etc/keydb/keydb.conf --server-threads 2 --requirepass ${KEYDB_PASSWORD}
     volumes:
       - keydb-data:/data
diff --git a/blueprints/keydb/template.toml b/blueprints/keydb/template.toml
index 9905c300..014ef47d 100644
--- a/blueprints/keydb/template.toml
+++ b/blueprints/keydb/template.toml
@@ -1,12 +1,6 @@
 [variables]
-main_domain = "${domain}"
 keydb_password = "${password:16}"
 
 [config]
-[[config.domains]]
-serviceName = "keydb"
-port = 6379
-host = "${main_domain}"
-
 [config.env]
 KEYDB_PASSWORD = "${keydb_password}"
diff --git a/blueprints/leantime/docker-compose.yml b/blueprints/leantime/docker-compose.yml
index 85776ddb..813748b5 100644
--- a/blueprints/leantime/docker-compose.yml
+++ b/blueprints/leantime/docker-compose.yml
@@ -4,8 +4,10 @@ services:
     image: leantime/leantime:latest
     restart: unless-stopped
     ports:
-      - 80
+      - 8080
     environment:
+      - LEAN_APP_URL=${LEAN_APP_URL}
+      - LEAN_SESSION_PASSWORD=${LEAN_SESSION_PASSWORD}
       - LEAN_DB_HOST=db
       - LEAN_DB_USER=${LEAN_DB_USER}
       - LEAN_DB_PASSWORD=${LEAN_DB_PASSWORD}
@@ -24,7 +26,7 @@ services:
       - MYSQL_DATABASE=${LEAN_DB_DATABASE}
       - MYSQL_USER=${LEAN_DB_USER}
       - MYSQL_PASSWORD=${LEAN_DB_PASSWORD}
-    command: --character-set-server=utf8 --collation-server=utf8_unicode_ci
+    command: --character-set-server=utf8mb4 --collation-server=utf8mb4_unicode_ci
     volumes:
       - db-data:/var/lib/mysql
 
diff --git a/blueprints/leantime/template.toml b/blueprints/leantime/template.toml
index 93150ab2..3b5c26af 100644
--- a/blueprints/leantime/template.toml
+++ b/blueprints/leantime/template.toml
@@ -4,14 +4,17 @@ db_password = "${password:16}"
 db_root_password = "${password:16}"
 db_user = "leantime"
 db_name = "leantime"
+session_password = "${password:32}"
 
 [config]
 [[config.domains]]
 serviceName = "leantime"
-port = 80
+port = 8080
 host = "${main_domain}"
 
 [config.env]
+LEAN_APP_URL = "http://${main_domain}"
+LEAN_SESSION_PASSWORD = "${session_password}"
 LEAN_DB_USER = "${db_user}"
 LEAN_DB_PASSWORD = "${db_password}"
 LEAN_DB_DATABASE = "${db_name}"
diff --git a/blueprints/matomo/docker-compose.yml b/blueprints/matomo/docker-compose.yml
deleted file mode 100644
index 65e11717..00000000
--- a/blueprints/matomo/docker-compose.yml
+++ /dev/null
@@ -1,34 +0,0 @@
-version: "3.8"
-services:
-  matomo:
-    image: matomo:5-apache
-    restart: unless-stopped
-    ports:
-      - 80
-    environment:
-      - MATOMO_DATABASE_HOST=db
-      - MATOMO_DATABASE_ADAPTER=mysql
-      - MATOMO_DATABASE_TABLES_PREFIX=matomo_
-      - MATOMO_DATABASE_USERNAME=${MATOMO_DB_USER}
-      - MATOMO_DATABASE_PASSWORD=${MATOMO_DB_PASSWORD}
-      - MATOMO_DATABASE_DBNAME=${MATOMO_DB_NAME}
-    volumes:
-      - matomo-data:/var/www/html
-    depends_on:
-      - db
-
-  db:
-    image: mariadb:11
-    restart: unless-stopped
-    command: --max-allowed-packet=64MB
-    environment:
-      - MYSQL_ROOT_PASSWORD=${MYSQL_ROOT_PASSWORD}
-      - MYSQL_DATABASE=${MATOMO_DB_NAME}
-      - MYSQL_USER=${MATOMO_DB_USER}
-      - MYSQL_PASSWORD=${MATOMO_DB_PASSWORD}
-    volumes:
-      - db-data:/var/lib/mysql
-
-volumes:
-  matomo-data: {}
-  db-data: {}
diff --git a/blueprints/matomo/matomo.png b/blueprints/matomo/matomo.png
deleted file mode 100644
index 6efce01e..00000000
Binary files a/blueprints/matomo/matomo.png and /dev/null differ
diff --git a/blueprints/matomo/meta.json b/blueprints/matomo/meta.json
deleted file mode 100644
index 0b94cfe5..00000000
--- a/blueprints/matomo/meta.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-  "id": "matomo",
-  "name": "Matomo",
-  "version": "5",
-  "description": "Matomo is the leading open-source web analytics platform that gives you full ownership of your data. A privacy-focused alternative to Google Analytics.",
-  "logo": "matomo.png",
-  "links": {
-    "github": "https://github.com/matomo-org/matomo",
-    "website": "https://matomo.org/",
-    "docs": "https://matomo.org/guides/"
-  },
-  "tags": [
-    "analytics",
-    "privacy",
-    "self-hosted"
-  ]
-}
diff --git a/blueprints/matomo/template.toml b/blueprints/matomo/template.toml
deleted file mode 100644
index cd432fe4..00000000
--- a/blueprints/matomo/template.toml
+++ /dev/null
@@ -1,18 +0,0 @@
-[variables]
-main_domain = "${domain}"
-db_password = "${password:16}"
-db_root_password = "${password:16}"
-db_user = "matomo"
-db_name = "matomo"
-
-[config]
-[[config.domains]]
-serviceName = "matomo"
-port = 80
-host = "${main_domain}"
-
-[config.env]
-MATOMO_DB_USER = "${db_user}"
-MATOMO_DB_PASSWORD = "${db_password}"
-MATOMO_DB_NAME = "${db_name}"
-MYSQL_ROOT_PASSWORD = "${db_root_password}"