diff --git a/ttcn3-pgw-test/PGW_Tests.cfg b/ttcn3-pgw-test/PGW_Tests.cfg
index d17e7829..5d3ff450 100644
--- a/ttcn3-pgw-test/PGW_Tests.cfg
+++ b/ttcn3-pgw-test/PGW_Tests.cfg
@@ -17,6 +17,7 @@ PGW_Tests.mp_run_prog_as_user := "osmocom"
 PGW_Tests.mp_ping_hostname := "10.45.0.1"
 PGW_Tests.mp_pcrf_local_ip:= "172.18.18.202"
 PGW_Tests.mp_ocs_local_ip:= "172.18.18.202"
+PGW_Tests.mp_aaa_local_ip:= "172.18.18.202"
 GTPv2_Emulation.mp_uecups_host := "172.18.18.20"
 
 [MAIN_CONTROLLER]
diff --git a/ttcn3-pgw-test/freeDiameter-smf.conf b/ttcn3-pgw-test/freeDiameter-smf.conf
index afa92985..207d1cc4 100644
--- a/ttcn3-pgw-test/freeDiameter-smf.conf
+++ b/ttcn3-pgw-test/freeDiameter-smf.conf
@@ -261,5 +261,5 @@ LoadExtension = "/usr/lib/x86_64-linux-gnu/freeDiameter/dict_dcca_3gpp.fdx";
 #ConnectPeer = "old.diameter.serv" { TcTimer = 60; TLS_old_method; No_SCTP; Port=3868; } ;
 ConnectPeer = "pcrf.localdomain" { ConnectTo = "172.18.18.202"; No_TLS; TcTimer = 2; };
 ConnectPeer = "ocs.localdomain" { ConnectTo = "172.18.18.202"; Port = 3869; No_TLS;  TcTimer = 2; };
-
+ConnectPeer = "aaa.localdomain" { ConnectTo = "172.18.18.202"; Port = 3870; No_TLS;  TcTimer = 2; };
 ##############################################################
diff --git a/ttcn3-pgw-test/open5gs-smf-latest.yaml b/ttcn3-pgw-test/open5gs-smf-latest.yaml
index 622618ba..0f80467d 100644
--- a/ttcn3-pgw-test/open5gs-smf-latest.yaml
+++ b/ttcn3-pgw-test/open5gs-smf-latest.yaml
@@ -1,7 +1,7 @@
 # See https://github.com/open5gs/open5gs/blob/main/configs/open5gs/smf.yaml.in
 
 logger:
-    level: info
+    level: debug
 
 sbi:
     server:
@@ -39,6 +39,9 @@ smf:
       - 2001:4860:4860::8888
       - 2001:4860:4860::8844
     mtu: 1400
+    p-cscf:
+      - 172.18.18.7
+      - fd02:db8:18::7
     ctf:
       enabled: auto
     freeDiameter: /data/freeDiameter-smf.conf
diff --git a/ttcn3-pgw-test/open5gs-smf-master.yaml b/ttcn3-pgw-test/open5gs-smf-master.yaml
index 3448abae..db91145a 100644
--- a/ttcn3-pgw-test/open5gs-smf-master.yaml
+++ b/ttcn3-pgw-test/open5gs-smf-master.yaml
@@ -1,7 +1,7 @@
 # See https://github.com/open5gs/open5gs/blob/main/configs/open5gs/smf.yaml.in
 
 logger:
-    level: info
+    level: debug
 
 global:
   max:
@@ -56,6 +56,9 @@ smf:
       - 2001:4860:4860::8888
       - 2001:4860:4860::8844
     mtu: 1400
+    p-cscf:
+      - 172.18.18.7
+      - fd02:db8:18::7
     ctf:
       enabled: auto
     freeDiameter: /data/freeDiameter-smf.conf