diff --git a/modules/keycloak/module.json b/modules/keycloak/module.json
index 919be3c..44e0d44 100644
--- a/modules/keycloak/module.json
+++ b/modules/keycloak/module.json
@@ -88,7 +88,9 @@
       "env": {
         "KC_DB": "postgres",
         "KC_HTTP_ENABLED": "true",
-        "KC_HEALTH_ENABLED": "true"
+        "KC_HEALTH_ENABLED": "true",
+        "KC_HOSTNAME": "https://keycloak.novox.be",
+        "KC_PROXY_HEADERS": "xforwarded"
       },
       "env-file": [
         "/var/lib/keycloak/admin.env",
@@ -118,7 +120,7 @@
       ],
       "env": {
         "MESH_BROKER_FILE": "/run/secrets/broker",
-        "MESH_KEYCLOAK_URL": "http://127.0.0.1:8080",
+        "MESH_KEYCLOAK_URL": "http://127.0.0.1:${port:8080}",
         "MESH_KEYCLOAK_CONFIG_FILE": "/run/config/config.json"
       },
       "restart-on": [
diff --git a/modules/postgres/module.json b/modules/postgres/module.json
index 3855f20..b543e5f 100644
--- a/modules/postgres/module.json
+++ b/modules/postgres/module.json
@@ -73,7 +73,8 @@
       "id": "store-data",
       "type": "directory",
       "path": "/var/lib/mesh-store",
-      "mode": "0700"
+      "mode": "0700",
+      "owner": "999:70"
     },
     {
       "id": "server",