diff --git a/intern/docker_omada/templates/docker-compose.yml b/intern/docker_omada/templates/docker-compose.yml
index fc280b3c2b78c638b3535929ef5ac0a7730041e0..82de50c20bee7c1d0f3cc50c54b88d61f693500c 100644
--- a/intern/docker_omada/templates/docker-compose.yml
+++ b/intern/docker_omada/templates/docker-compose.yml
@@ -5,15 +5,18 @@ services:
     image: mbentley/omada-controller:latest
     restart: always
     ports:
-      - {{ omada_port_http }}:8088
-      - {{ omada_port_https }}:8043
-      - {{ omada_portal_https }}:8843 
+      - "{{ omada_port_http }}:{{ omada_port_http }}"
+      - "{{ omada_port_https }}:{{ omada_port_https }}"
+      - "{{ omada_portal_https }}:{{ omada_portal_https }}"
       - 27001:27001/udp 
+      - 27002:27002 
       - 29810:29810/udp 
       - 29811:29811 
       - 29812:29812 
       - 29813:29813 
       - 29814:29814 
+      - 29815:29815 
+      - 29816:29816 
     sysctls:
       - net.ipv4.ip_unprivileged_port_start=0
     volumes:
@@ -34,6 +37,8 @@ services:
       PORT_DISCOVERY: 29810
       PORT_MANAGER_V1: 29811
       PORT_MANAGER_V2: 29814
+      PORT_TRANSFER_V2: 29815
+      PORT_RTTY: 29816
       PORT_UPGRADE_V1: 29813
       SHOW_SERVER_LOGS: "true"
       SHOW_MONGODB_LOGS: "false"
diff --git a/testserver/docker_matrix/templates/synapse-data/homeserver.yaml b/testserver/docker_matrix/templates/synapse-data/homeserver.yaml
index 7415de8c4f12868621649784372a85f7077d222a..dfe3b835e821eacf72696adbc52d06cb4d116a70 100644
--- a/testserver/docker_matrix/templates/synapse-data/homeserver.yaml
+++ b/testserver/docker_matrix/templates/synapse-data/homeserver.yaml
@@ -65,21 +65,21 @@ thumbnail_sizes:
 
 url_preview_enabled: true
 url_preview_ip_range_blacklist:
- - '127.0.0.0/8'
- - '10.0.0.0/8'
- - '172.16.0.0/12'
- - '192.168.0.0/16'
- - '100.64.0.0/10'
- - '192.0.0.0/24'
- - '169.254.0.0/16'
- - '198.18.0.0/15'
- - '192.0.2.0/24'
- - '198.51.100.0/24'
- - '203.0.113.0/24'
- - '224.0.0.0/4'
- - '::1/128'
- - 'fe80::/10'
- - 'fc00::/7'
+  - '127.0.0.0/8'
+  - '10.0.0.0/8'
+  - '172.16.0.0/12'
+  - '192.168.0.0/16'
+  - '100.64.0.0/10'
+  - '192.0.0.0/24'
+  - '169.254.0.0/16'
+  - '198.18.0.0/15'
+  - '192.0.2.0/24'
+  - '198.51.100.0/24'
+  - '203.0.113.0/24'
+  - '224.0.0.0/4'
+  - '::1/128'
+  - 'fe80::/10'
+  - 'fc00::/7'
 
 max_spider_size: 10M
 
@@ -104,6 +104,7 @@ oidc_providers:
     user_mapping_provider:
       config:
         subject_claim: "preferred_username"
+        subject_template: "{% raw %}{{ user.preferred_username }}{% endraw %}"
         localpart_template: "{% raw %}{{ user.preferred_username }}{% endraw %}"
         display_name_template: "{% raw %}{{ user.name }}{% endraw %}"
         email_template: "{% raw %}{{ user.email }}{% endraw %}"