diff --git a/templates/osmo-cc-misdn-endpoint.tpl b/templates/osmo-cc-misdn-endpoint.tpl
index 84d79b0..1f6cbdc 100644
--- a/templates/osmo-cc-misdn-endpoint.tpl
+++ b/templates/osmo-cc-misdn-endpoint.tpl
@@ -7,6 +7,7 @@ ${layer_1_hold}
 verbose ${verboselevel}
 ${aocd}
 ${aocs}
+local-tones ${local_tones}
 timeouts 60,4,180,180,60
 cc 'name v5-${v5_if}-${v5_port}'
 cc 'local ${cc_ip}:${cc_port}'
diff --git a/templates/osmo-cc-pstn-endpoint.tpl b/templates/osmo-cc-pstn-endpoint.tpl
index aa13f88..6a2598b 100644
--- a/templates/osmo-cc-pstn-endpoint.tpl
+++ b/templates/osmo-cc-pstn-endpoint.tpl
@@ -9,6 +9,7 @@ ${loop_disconnect}
 ${lr_on_connect}
 ${recall}
 ${metering}
+local-tones ${local_tones}
 cc 'name v5-${v5_if}-${v5_port}'
 cc 'local ${cc_ip}:${cc_port}'
 cc 'remote ${cc_ip}:4000'
diff --git a/v5_config_generator.sh b/v5_config_generator.sh
index a001047..b98b905 100755
--- a/v5_config_generator.sh
+++ b/v5_config_generator.sh
@@ -33,6 +33,7 @@ OSMOPSTNCFG['metering']="metering"
 OSMOPSTNCFG['recall']=""
 OSMOPSTNCFG['loop_disconnect']=""
 OSMOPSTNCFG['lr_on_connect']=""
+OSMOPSTNCFG['local_tones']="german"
 
 OSMOISDNCFG['cc_ip']="$SYSIP"
 OSMOISDNCFG['v5_if']="$V5_IFADDR"
@@ -40,6 +41,7 @@ OSMOISDNCFG['verboselevel']="2"
 OSMOISDNCFG['aocd']="aocd"
 OSMOISDNCFG['aocs']="aocs"
 OSMOISDNCFG['layer_1_hold']="layer-1-hold 1"
+OSMOISDNCFG['local_tones']="german"
 
 template() {
     ARRAY_NAME="$1"
@@ -59,17 +61,22 @@ read ok
 
 
 ### Stop and disable PSTN endpoints
-cd /etc/systemd/system/multi-user.target.wants
-for i in `ls osmo-cc-pstn-endpoint@*`; do
-	echo "Stop and disable endpoint $i..."
-	systemctl stop $i
-	systemctl disable $i
-done
-for i in `ls osmo-cc-misdn-endpoint@*`; do
-	echo "Stop and disable endpoint $i..."
-	systemctl stop $i
-	systemctl disable $i
-done
+#cd /etc/systemd/system/multi-user.target.wants
+#for i in `ls osmo-cc-pstn-endpoint@*`; do
+#	echo "Stop and disable endpoint $i..."
+#	systemctl stop $i
+#	systemctl disable $i
+#done
+#for i in `ls osmo-cc-misdn-endpoint@*`; do
+#	echo "Stop and disable endpoint $i..."
+#	systemctl stop $i
+#	systemctl disable $i
+#done
+echo "Stop and disable PSTN/ISDN endpoints..."
+systemctl stop osmo-cc-pstn-endpoint@\*.service
+systemctl disable osmo-cc-pstn-endpoint@.service
+systemctl stop osmo-cc-misdn-endpoint@\*.service
+systemctl disable osmo-cc-misdn-endpoint@.service
 
 ### Stop OSMO-V5-LE
 
@@ -128,16 +135,34 @@ done
 
 for portgroup in ${!PSTNPORTS[@]}; do
 	for i in `seq ${PSTNPORTS[$portgroup]}`; do
-		echo "Enable and start PSTN endpoint ${V5_IFADDR}_$i"
-		systemctl enable osmo-cc-pstn-endpoint@${V5_IFADDR}_$i.service
-		systemctl start osmo-cc-pstn-endpoint@${V5_IFADDR}_$i.service
-	done
-done
-for portgroup in ${!ISDNPORTS[@]}; do
-	for i in `seq ${ISDNPORTS[$portgroup]}`; do
-		echo "Enable and start ISDN endpoint ${V5_IFADDR}_$i"
-		systemctl enable osmo-cc-misdn-endpoint@${V5_IFADDR}_$i.service
-		systemctl start osmo-cc-misdn-endpoint@${V5_IFADDR}_$i.service
+		echo "Enable PSTN endpoint ${V5_IFADDR}_$i"
+		systemctl --no-reload enable osmo-cc-pstn-endpoint@${V5_IFADDR}_$i.service
 	done
 done
 
+echo "Reloading systemd"
+systemctl daemon-reload
+
+for portgroup in ${!PSTNPORTS[@]}; do
+	for i in `seq ${PSTNPORTS[$portgroup]}`; do
+		echo "Start PSTN endpoint ${V5_IFADDR}_$i"
+		systemctl start osmo-cc-pstn-endpoint@${V5_IFADDR}_$i.service
+	done
+done
+
+for portgroup in ${!ISDNPORTS[@]}; do
+	for i in `seq ${ISDNPORTS[$portgroup]}`; do
+		echo "Enable ISDN endpoint ${V5_IFADDR}_$i"
+		systemctl --no-reload enable osmo-cc-misdn-endpoint@${V5_IFADDR}_$i.service
+	done
+done
+
+echo "Reloading systemd"
+systemctl daemon-reload
+
+for portgroup in ${!ISDNPORTS[@]}; do
+	for i in `seq ${ISDNPORTS[$portgroup]}`; do
+		echo "Start ISDN endpoint ${V5_IFADDR}_$i"
+		systemctl start osmo-cc-misdn-endpoint@${V5_IFADDR}_$i.service
+	done
+done