diff --git a/backend/dev_homeserver.yaml b/backend/dev_homeserver.yaml
index 5697c32e..eab4e698 100644
--- a/backend/dev_homeserver.yaml
+++ b/backend/dev_homeserver.yaml
@@ -1,5 +1,5 @@
-server_name: "synapse.localhost"
-public_baseurl: http://synapse.localhost:8008/
+server_name: "synapse.m.localhost"
+public_baseurl: https://synapse.m.localhost/
 
 pid_file: /data/homeserver.pid
 
diff --git a/backend/dev_nginx.conf b/backend/dev_nginx.conf
index e4d665d6..bc60f9c1 100644
--- a/backend/dev_nginx.conf
+++ b/backend/dev_nginx.conf
@@ -5,7 +5,7 @@ server {
     listen                  8448 ssl;
     listen                  [::]:443 ssl;
     listen                  [::]:8448 ssl;
-    server_name             synapse.localhost;
+    server_name             synapse.m.localhost;
     ssl_certificate         /root/ssl/cert.pem;
     ssl_certificate_key     /root/ssl/key.pem;
 
@@ -17,7 +17,7 @@ server {
     # setting for livekit_service_url
     location /.well-known/matrix/client {
         add_header Access-Control-Allow-Origin *;
-        return 200 '{"m.homeserver": {"base_url": "http://synapse.localhost:8008"}, "org.matrix.msc4143.rtc_foci": [{"type": "livekit", "livekit_service_url": "http://matrix-rtc.localhost:8008/livekit/jwt"}]}';
+        return 200 '{"m.homeserver": {"base_url": "https://synapse.m.localhost"}, "org.matrix.msc4143.rtc_foci": [{"type": "livekit", "livekit_service_url": "https://matrix-rtc.m.localhost/livekit/jwt"}]}';
         default_type application/json;
     }
 
@@ -46,7 +46,7 @@ server {
     listen                  8448 ssl;
     listen                  [::]:443 ssl;
     listen                  [::]:8448 ssl;
-    server_name             matrix-rtc.localhost;
+    server_name             matrix-rtc.m.localhost;
     ssl_certificate         /root/ssl/cert.pem;
     ssl_certificate_key     /root/ssl/key.pem;
 
diff --git a/dev-backend-docker-compose.yml b/dev-backend-docker-compose.yml
index 38853054..ad25bf75 100644
--- a/dev-backend-docker-compose.yml
+++ b/dev-backend-docker-compose.yml
@@ -7,7 +7,7 @@ services:
     hostname: auth-server
     environment:
       - LK_JWT_PORT=8080
-      - LIVEKIT_URL=ws://matrix-rtc.localhost/livekit/sfu
+      - LIVEKIT_URL=wss://matrix-rtc.m.localhost/livekit/sfu
       - LIVEKIT_KEY=devkey
       - LIVEKIT_SECRET=secret
       # If the configured homeserver runs on localhost, it'll probably be using
@@ -83,7 +83,7 @@ services:
 
   nginx:
     #  openssl req -x509 -nodes -days 3650 -newkey rsa:2048 -keyout tls_localhost_key.pem -out tls_localhost_cert.pem -subj "/C=GB/ST=London/L=London/O=Alros/OU=IT Department/CN=localhost"
-    hostname: synapse.localhost
+    hostname: synapse.m.localhost
     image: nginx:latest
     volumes:
       - ./backend/dev_nginx.conf:/etc/nginx/conf.d/default.conf:Z