diff --git a/acceptance/router_benchmark/conf/topology.json b/acceptance/router_benchmark/conf/topology.json
index 53c7cfb01f..e005f1bd14 100644
--- a/acceptance/router_benchmark/conf/topology.json
+++ b/acceptance/router_benchmark/conf/topology.json
@@ -4,6 +4,7 @@
   ],
   "isd_as": "1-ff00:0:1",
   "mtu": 1400,
+  "endhost_port_range": "1024-65535",
   "border_routers": {
     "br1a": {
       "internal_addr": "10.123.10.1:30042",
diff --git a/dist/conffiles/dispatcher.toml b/dist/conffiles/dispatcher.toml
index d6f83a1ddc..1394e70d99 100644
--- a/dist/conffiles/dispatcher.toml
+++ b/dist/conffiles/dispatcher.toml
@@ -1,10 +1,14 @@
 [dispatcher]
 id = "dispatcher"
-socket_file_mode = "0777"
 
 [log.console]
 level = "info"
 
+# If infra SVCs need to run with old br
+# [dispatcher.service_addresses]
+# "1-ff00:0:110,CS" = "172.20.0.20:30252"
+# "1-ff00:0:110,DS" = "172.20.0.20:30252"
+
 # Optionally expose metrics and other local inspection endpoints.
 # [metrics]
 # prometheus = "[127.0.0.1]:30441"
diff --git a/dist/conffiles/sciond.toml b/dist/conffiles/sciond.toml
index 3abf018ab7..2401c8f1ca 100644
--- a/dist/conffiles/sciond.toml
+++ b/dist/conffiles/sciond.toml
@@ -1,7 +1,6 @@
 [general]
 id = "sd"
 config_dir = "/etc/scion"
-reconnect_to_dispatcher = true
 
 [path_db]
 connection = "/var/lib/scion/sd.path.db"
diff --git a/dist/systemd/scion-dispatcher.service b/dist/systemd/scion-dispatcher.service
index 8621330f70..a5ad58aac7 100644
--- a/dist/systemd/scion-dispatcher.service
+++ b/dist/systemd/scion-dispatcher.service
@@ -9,7 +9,6 @@ StartLimitInterval=1s
 Type=simple
 User=scion
 Group=scion
-ExecStartPre=/bin/rm -rf /run/shm/dispatcher/
 ExecStart=/usr/bin/scion-dispatcher --config /etc/scion/dispatcher.toml
 LimitNOFILE=4096
 Restart=on-failure
diff --git a/dist/test/deb_test.sh b/dist/test/deb_test.sh
index 2ae6179774..4456f9ad2d 100755
--- a/dist/test/deb_test.sh
+++ b/dist/test/deb_test.sh
@@ -61,6 +61,7 @@ INNER_EOF
         {
             "isd_as": "1-ff00:0:a",
             "mtu": 1472,
+            "endhost_port_range": "1024-65535",
             "border_routers": {
                 "br-1": {
                     "internal_addr": "127.0.0.1:30001"