diff --git a/Makefile b/Makefile
index 7988407..060d922 100644
--- a/Makefile
+++ b/Makefile
@@ -48,7 +48,7 @@ run-mm-replicas:
 run-rtcd:
 	@echo "Starting RTCD..."
 	@docker-compose up -d mattermost-rtcd
-	@docker exec -it cs-repro-mattermost mmctl config set PluginSettings.Plugins.com.mattermost.calls.rtcdserviceurl "http://mattermost-rtcd" --local
+	@docker exec -it cs-repro-mattermost mmctl config patch /mattermost/config/rtcdConfig.json --local
 	@docker exec -it cs-repro-mattermost mmctl plugin disable com.mattermost.calls --local
 	@docker exec -it cs-repro-mattermost mmctl plugin enable com.mattermost.calls --local
 
diff --git a/docker-compose.yml b/docker-compose.yml
index c2510ed..07d502c 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,7 +1,7 @@
 services:
   postgres:
     container_name: cs-repro-postgres
-    image: postgres:14-alpine
+    image: postgres:16-alpine
     restart: unless-stopped
     ports:
       - "5432:5432"
@@ -89,6 +89,7 @@ services:
       - ./files/mattermost/advancedLogging.json:/mattermost/config/advancedLogging.json:ro
       - ./files/mattermost/defaultConfig.json:/mattermost/config/defaultConfig.json:ro
       - ./files/mattermost/replicaConfig.json:/mattermost/config/replicaConfig.json:ro
+      - ./files/mattermost/rtcdConfig.json:/mattermost/config/rtcdConfig.json:ro
     environment:
       - MM_SqlSettings_DriverName=postgres
       - MM_SqlSettings_DataSource=postgres://mmuser:mmuser_password@cs-repro-postgres:5432/mattermost?sslmode=disable&connect_timeout=10&binary_parameters=yes
@@ -146,7 +147,7 @@ services:
       - POSTGRES_PASSWORD=mmuser_password
       - LISTEN_ADDRESS="*"
       - REPLICA_NAME=replica_1
-    image: postgres:14-alpine
+    image: postgres:16-alpine
     restart: unless-stopped
     ports:
       - "5433:5432"
@@ -170,7 +171,7 @@ services:
       - POSTGRES_PASSWORD=mmuser_password
       - LISTEN_ADDRESS="*"
       - REPLICA_NAME=replica_2
-    image: postgres:14-alpine
+    image: postgres:16-alpine
     restart: unless-stopped
     ports:
       - "5434:5432"
diff --git a/files/mattermost/rtcdConfig.json b/files/mattermost/rtcdConfig.json
new file mode 100644
index 0000000..fbc4a96
--- /dev/null
+++ b/files/mattermost/rtcdConfig.json
@@ -0,0 +1,9 @@
+{
+  "PluginSettings": {
+    "Plugins": {
+        "com.mattermost.calls": {
+            "rtcdserviceurl": "http://mattermost-rtcd"
+        }
+    }
+  }
+}
\ No newline at end of file