diff --git a/scenarios/invite_emergency_cirpack/0007_test.yml.tt2 b/scenarios/invite_emergency_cirpack/0007_test.yml.tt2
index c4c0f0f5..cd84082e 100644
--- a/scenarios/invite_emergency_cirpack/0007_test.yml.tt2
+++ b/scenarios/invite_emergency_cirpack/0007_test.yml.tt2
@@ -15,7 +15,7 @@ sip_in:
   - 'Contact: <sip:[% scenarios.0.responders.0.ip %]:[% scenarios.0.responders.0.port %];transport=UDP>'
   - 'Content-Length: 0'
   - 'P-NGCP-Src-Ip: [% scenarios.0.responders.0.ip %]'
-  - 'P-NGCP-Src-Port: [% scenarios.0.port %]'
+  - 'P-NGCP-Src-Port: [% scenarios.0.responders.0.port %]'
   - 'P-NGCP-Src-Proto: udp'
   - 'P-NGCP-Src-Af: 4'
 sip_out:
@@ -24,10 +24,10 @@ sip_out:
       'From: <sip:[% invite_emergency_cirpack_scenarios_test.testuser1002.phone_number %]@invite-emergency-cirpack.scenarios.test>;tag=[\w-]+',
       'To: <sip:E1112@[% scenarios.0.responders.0.ip %]>;tag=[\w-]+',
       'CSeq: \d+ INVITE',
-      'Contact: <sip:[% scenarios.0.responders.0.ip %]:[% scenarios.0.port %];transport=UDP>',
+      'Contact: <sip:[% scenarios.0.responders.0.ip %]:[% scenarios.0.responders.0.port %];transport=UDP>',
       'Content-Length: 0',
       'P-NGCP-Src-Ip: [% scenarios.0.responders.0.ip %]',
-      'P-NGCP-Src-Port: [% scenarios.0.port %]',
+      'P-NGCP-Src-Port: [% scenarios.0.responders.0.port %]',
       'P-NGCP-Src-Proto: udp',
       'P-NGCP-Src-Af: 4',
     ]
diff --git a/scenarios/invite_emergency_cirpack/0009_test.yml.tt2 b/scenarios/invite_emergency_cirpack/0009_test.yml.tt2
index 92131cac..6d9a5fe6 100644
--- a/scenarios/invite_emergency_cirpack/0009_test.yml.tt2
+++ b/scenarios/invite_emergency_cirpack/0009_test.yml.tt2
@@ -14,11 +14,11 @@ sip_in:
   - 'From: <sip:[% invite_emergency_cirpack_scenarios_test.testuser1002.phone_number %]@invite-emergency-cirpack.scenarios.test>;tag=[\w-]+'
   - 'To: <sip:E1112@[% scenarios.0.responders.0.ip %]>;tag=[\w-]+'
   - 'CSeq: \d+ INVITE'
-  - 'Contact: <sip:[% scenarios.0.responders.0.ip %]:[% scenarios.0.port %];transport=UDP>'
+  - 'Contact: <sip:[% scenarios.0.responders.0.ip %]:[% scenarios.0.responders.0.port %];transport=UDP>'
   - 'Content-Type: application/sdp'
   - 'Content-Length:\s+\d+'
   - 'P-NGCP-Src-Ip: [% scenarios.0.responders.0.ip %]'
-  - 'P-NGCP-Src-Port: [% scenarios.0.port %]'
+  - 'P-NGCP-Src-Port: [% scenarios.0.responders.0.port %]'
   - 'P-NGCP-Src-Proto: udp'
   - 'P-NGCP-Src-Af: 4'
 sip_out:
@@ -31,7 +31,7 @@ sip_out:
       'Content-Type: application/sdp',
       'Content-Length:\s+\d+',
       'P-NGCP-Src-Ip: [% scenarios.0.responders.0.ip %]',
-      'P-NGCP-Src-Port: [% scenarios.0.port %]',
+      'P-NGCP-Src-Port: [% scenarios.0.responders.0.port %]',
       'P-NGCP-Src-Proto: udp',
       'P-NGCP-Src-Af: 4',
     ]
diff --git a/scenarios/invite_emergency_cirpack/0013_test.yml.tt2 b/scenarios/invite_emergency_cirpack/0013_test.yml.tt2
index 08534fd4..49e9ab82 100644
--- a/scenarios/invite_emergency_cirpack/0013_test.yml.tt2
+++ b/scenarios/invite_emergency_cirpack/0013_test.yml.tt2
@@ -35,7 +35,7 @@ sip_in:
   - 'Contact: sip:[% scenarios.0.username %]@[% scenarios.0.ip %]:[% scenarios.0.port %]'
   - 'Content-Length: 0'
   - 'P-NGCP-Src-Ip: [% scenarios.0.ip %]'
-  - 'P-NGCP-Src-Port: [% scenarios.0.responders.0.port %]'
+  - 'P-NGCP-Src-Port: [% scenarios.0.port %]'
   - 'P-NGCP-Src-Proto: udp'
   - 'P-NGCP-Src-Af: 4'
   - 'P-Sock-Info: udp:127.0.0.1:5060'
diff --git a/scenarios/invite_emergency_cirpack/0015_test.yml.tt2 b/scenarios/invite_emergency_cirpack/0015_test.yml.tt2
index cbff870e..c78162eb 100644
--- a/scenarios/invite_emergency_cirpack/0015_test.yml.tt2
+++ b/scenarios/invite_emergency_cirpack/0015_test.yml.tt2
@@ -17,10 +17,10 @@ sip_in:
   - 'From: <sip:[% invite_emergency_cirpack_scenarios_test.testuser1002.phone_number %]@invite-emergency-cirpack.scenarios.test>;tag=[\w-]+'
   - 'To: <sip:E1112@[% scenarios.0.responders.0.ip %]>;tag=[\w-]+'
   - 'CSeq: \d+ BYE'
-  - 'Contact: <sip:[% scenarios.0.responders.0.ip %]:[% scenarios.0.port %];transport=UDP>'
+  - 'Contact: <sip:[% scenarios.0.responders.0.ip %]:[% scenarios.0.responders.0.port %];transport=UDP>'
   - 'Content-Length: \s+0'
   - 'P-NGCP-Src-Ip: [% scenarios.0.responders.0.ip %]'
-  - 'P-NGCP-Src-Port: [% scenarios.0.port %]'
+  - 'P-NGCP-Src-Port: [% scenarios.0.responders.0.port %]'
   - 'P-NGCP-Src-Proto: udp'
   - 'P-NGCP-Src-Af: 4'
 sip_out:
@@ -29,10 +29,10 @@ sip_out:
       'From: <sip:[% invite_emergency_cirpack_scenarios_test.testuser1002.phone_number %]@invite-emergency-cirpack.scenarios.test>;tag=[\w-]+',
       'To: <sip:E1112@[% scenarios.0.responders.0.ip %]>;tag=[\w-]+',
       'CSeq: \d+ BYE',
-      'Contact: <sip:[% scenarios.0.responders.0.ip %]:[% scenarios.0.port %];transport=UDP>',
+      'Contact: <sip:[% scenarios.0.responders.0.ip %]:[% scenarios.0.responders.0.port %];transport=UDP>',
       'Content-Length: \s+0',
       'P-NGCP-Src-Ip: [% scenarios.0.responders.0.ip %]',
-      'P-NGCP-Src-Port: [% scenarios.0.port %]',
+      'P-NGCP-Src-Port: [% scenarios.0.responders.0.port %]',
       'P-NGCP-Src-Proto: udp',
       'P-NGCP-Src-Af: 4',
     ]
diff --git a/scenarios/invite_emergency_cirpack/scenario.yml b/scenarios/invite_emergency_cirpack/scenario.yml
index 063b0572..c08bdf84 100644
--- a/scenarios/invite_emergency_cirpack/scenario.yml
+++ b/scenarios/invite_emergency_cirpack/scenario.yml
@@ -1,6 +1,11 @@
 ---
 test_uuid: invite_emergency_cirpack
 description: emergency call to a peer adding geolocation with cirpack format
+kamailio:
+  proxy:
+    debugger:
+      - name: textops
+        level: 3
 domains:
   invite-emergency-cirpack.scenarios.test:
     reseller_id: 1
@@ -31,5 +36,5 @@ scenarios:
         number: 112
         username: 112
         domain: invite-emergency-cirpack.scenarios.test
-        peer_host: peer_emergency_cirpack_host0
+        peer_host: peer_invite_emergency_cirpack_host0
         register: 'no'
diff --git a/scenarios/invite_emergency_pidflo/scenario.yml b/scenarios/invite_emergency_pidflo/scenario.yml
index f5ff4771..ee8f8ee1 100644
--- a/scenarios/invite_emergency_pidflo/scenario.yml
+++ b/scenarios/invite_emergency_pidflo/scenario.yml
@@ -1,6 +1,11 @@
 ---
 test_uuid: invite_emergency_pidflo
 description: emergency call to a peer adding geolocation with pidflo format
+kamailio:
+  proxy:
+    debugger:
+      - name: textops
+        level: 3
 domains:
   invite-emergency-pidflo.scenarios.test:
     reseller_id: 1
@@ -31,5 +36,5 @@ scenarios:
         number: 112
         username: 112
         domain: invite-emergency-pidflo.scenarios.test
-        peer_host: peer_invite_emergency_pidflo
+        peer_host: peer_invite_emergency_pidflo_host0
         register: 'no'