diff --git a/src/osmo_gsm_tester/templates/open5gs-smfd.yaml.tmpl b/src/osmo_gsm_tester/templates/open5gs-smfd.yaml.tmpl
index 00a0eaeb..463e6628 100644
--- a/src/osmo_gsm_tester/templates/open5gs-smfd.yaml.tmpl
+++ b/src/osmo_gsm_tester/templates/open5gs-smfd.yaml.tmpl
@@ -315,8 +315,8 @@ smf:
     gtpc:
       - addr: ${epc.addr_smf}
     gtpu:
-      - addr: ${epc.run_addr}
-        port: 2153
+      - addr: ${epc.addr_smf}
+        port: 2152
     subnet:
       - addr: ${epc.tun_addr}/${epc.tun_netmask}
     dns:
diff --git a/src/osmo_gsm_tester/templates/open5gs-upfd.yaml.tmpl b/src/osmo_gsm_tester/templates/open5gs-upfd.yaml.tmpl
index 757c0ec4..55b78f64 100644
--- a/src/osmo_gsm_tester/templates/open5gs-upfd.yaml.tmpl
+++ b/src/osmo_gsm_tester/templates/open5gs-upfd.yaml.tmpl
@@ -107,8 +107,8 @@ upf:
     pfcp:
       - addr: ${epc.addr_upf}
     gtpu:
-      - addr: ${epc.run_addr}
-        port: 2154
+      - addr: ${epc.addr_upf}
+        port: 2152
     subnet:
       - addr: ${epc.tun_addr}/${epc.tun_netmask}
         dnn: ${epc.apn_name}