diff --git a/scenarios_lnp/incoming_peer/0001_test.yml.tt2 b/scenarios_lnp/incoming_peer/0001_test.yml.tt2
index 73069903..44829fd2 100644
--- a/scenarios_lnp/incoming_peer/0001_test.yml.tt2
+++ b/scenarios_lnp/incoming_peer/0001_test.yml.tt2
@@ -23,7 +23,7 @@ flow:
   - start|ROUTE_DLG_MANAGE:
   - return|ROUTE_DLG_MANAGE:
   - return|ROUTE_LOAD_PEER_IN_PREF:
-      $avp(lua_dlg_profile): ["peer:[% peer_00_host0.id %]", "total"]
+      $avp(lua_dlg_profile): ["peer:[% peer_incoming_peer_00_host0.id %]", "total"]
   - return|ROUTE_FIND_CALLER:
   - start|ROUTE_APPLY_HEADER_RULES:
   - return|ROUTE_APPLY_HEADER_RULES:
@@ -49,10 +49,10 @@ flow:
   - return|ROUTE_SET_CALLEE_DIALOG:
         $avp(lua_dlg_profile): [
         "totalaccount:[% customer_test.id %]",
-        "totaluser:[% spce_test.testuser1003.uuid %]",
+        "totaluser:[% incoming_peer_scenarios_lnp_test.testuser1003.uuid %]",
         "account:[% customer_test.id %]",
-        "user:[% spce_test.testuser1003.uuid %]",
-        "peer:[% peer_00_host0.id %]",
+        "user:[% incoming_peer_scenarios_lnp_test.testuser1003.uuid %]",
+        "peer:[% peer_incoming_peer_00_host0.id %]",
         "total"
       ]
   - start|ROUTE_BLOCK_IN:
@@ -128,15 +128,15 @@ flow:
   - exit|ROUTE_EXIT:
       $avp(lua_dlg_profile): [
         "totalaccount:[% customer_test.id %]",
-        "totaluser:[% spce_test.testuser1003.uuid %]",
+        "totaluser:[% incoming_peer_scenarios_lnp_test.testuser1003.uuid %]",
         "account:[% customer_test.id %]",
-        "user:[% spce_test.testuser1003.uuid %]",
-        "peer:[% peer_00_host0.id %]",
+        "user:[% incoming_peer_scenarios_lnp_test.testuser1003.uuid %]",
+        "peer:[% peer_incoming_peer_00_host0.id %]",
         "total"
       ]
 sip_in:
-  - '^INVITE sip:4311001@'
-  - 'Contact: sip:004321001@'
+  - '^INVITE sip:[% incoming_peer_scenarios_lnp_test.testuser1001.phone_number %]@'
+  - 'Contact: sip:[% scenarios.0.username %]@'
   - 'CSeq: 1 INVITE'
   - 'Max-Forwards: 69'
   - 'Content-Type: application/sdp'
@@ -144,24 +144,24 @@ sip_out:
   - [
       '^SIP/2.0 100 Trying',
       'CSeq: 1 INVITE',
-      'From: <sip:004321001@',
-      'To: <sip:4311001@'
+      'From: <sip:[% scenarios.0.username %]@',
+      'To: <sip:[% incoming_peer_scenarios_lnp_test.testuser1001.phone_number %]@'
     ]
   - [
-      '^INVITE sip:4311003@',
+      '^INVITE sip:[% extra_info.phone_numbers.0 %]@',
       'CSeq: 1 INVITE',
-      'From: <sip:004321001@',
-      'To: <sip:4311001@',
-      'Contact: sip:004321001@',
+      'From: <sip:[% scenarios.0.username %]@',
+      'To: <sip:[% incoming_peer_scenarios_lnp_test.testuser1001.phone_number %]@',
+      'Contact: sip:[% scenarios.0.username %]@',
       'Content-Type: application/sdp',
       'P-HIH-Cause: 302',
       'P-From-Peer: 1',
-      'P-Caller-UUID: [% spce_test.testuser1003.uuid %]',
-      'P-First-Caller-UPN: 004321001',
-      'P-First-Caller-NPN: 004321001',
+      'P-Caller-UUID: [% incoming_peer_scenarios_lnp_test.testuser1003.uuid %]',
+      'P-First-Caller-UPN: [% scenarios.0.username %]',
+      'P-First-Caller-NPN: [% scenarios.0.username %]',
       'P-Acc-Caller-User: testuser1001',
       'P-CF-Depth: 1',
-      'P-Orig-Callee-Dialed: 4311001',
+      'P-Orig-Callee-Dialed: [% incoming_peer_scenarios_lnp_test.testuser1001.phone_number %]',
       'P-App-Param: ;profile=ngcp_cf',
       'P-App-Name: sbc'
     ]
diff --git a/scenarios_lnp/incoming_peer/0003_test.yml.tt2 b/scenarios_lnp/incoming_peer/0003_test.yml.tt2
index 0f864fd8..dd44df6e 100644
--- a/scenarios_lnp/incoming_peer/0003_test.yml.tt2
+++ b/scenarios_lnp/incoming_peer/0003_test.yml.tt2
@@ -48,10 +48,10 @@ flow:
   - start|ROUTE_CLEAR_CALLEE_PREF:
   - return|ROUTE_CLEAR_CALLEE_PREF:
   - start|ROUTE_LNP:
-      $avp(callee_cli): ['4311003']
+      $avp(callee_cli): ['[% extra_info.phone_numbers.0 %]']
   - start|ROUTE_APPLY_CALLEE_LNP_RWR:
   - start|ROUTE_LNP_SET_URI:
-      $var(lnp_dst): 4318881003
+      $var(lnp_dst): [% extra_info.phone_numbers.1 %]
   - return|ROUTE_LNP_SET_URI:
   - return|ROUTE_APPLY_CALLEE_LNP_RWR:
   - return|ROUTE_LNP:
@@ -92,8 +92,8 @@ flow:
   - start|ROUTE_OUTBOUND:
       $avp(lua_dlg_profile): [
         "relay",
-        "peerout:[% peer_01_host1.id %]",
-        "peer:[% peer_01_host1.id %]",
+        "peerout:[% peer_incoming_peer_01_host1.id %]",
+        "peer:[% peer_incoming_peer_01_host1.id %]",
         "outgoing"
       ]
   - start|ROUTE_SET_CALLER_DIALOG:
@@ -102,16 +102,16 @@ flow:
   - return|ROUTE_SET_CALLER_DIALOG:
       $avp(lua_dlg_profile): [
         "accountout:[% customer_test.id %]",
-        "userout:[% spce_test.testuser1003.uuid %]",
+        "userout:[% incoming_peer_scenarios_lnp_test.testuser1003.uuid %]",
         "account:[% customer_test.id %]",
-        "user:[% spce_test.testuser1003.uuid %]",
+        "user:[% incoming_peer_scenarios_lnp_test.testuser1003.uuid %]",
         "totalaccountout:[% customer_test.id %]",
-        "totaluserout:[% spce_test.testuser1003.uuid %]",
+        "totaluserout:[% incoming_peer_scenarios_lnp_test.testuser1003.uuid %]",
         "totalaccount:[% customer_test.id %]",
-        "totaluser:[% spce_test.testuser1003.uuid %]",
+        "totaluser:[% incoming_peer_scenarios_lnp_test.testuser1003.uuid %]",
         "relay",
-        "peerout:[% peer_01_host1.id %]",
-        "peer:[% peer_01_host1.id %]",
+        "peerout:[% peer_incoming_peer_01_host1.id %]",
+        "peer:[% peer_incoming_peer_01_host1.id %]",
         "outgoing"
       ]
   - start|ROUTE_ACC_CALLER:
@@ -178,46 +178,46 @@ flow:
   - exit|ROUTE_EXIT:
       $avp(lua_dlg_profile): [
         "accountout:[% customer_test.id %]",
-        "userout:[% spce_test.testuser1003.uuid %]",
+        "userout:[% incoming_peer_scenarios_lnp_test.testuser1003.uuid %]",
         "account:[% customer_test.id %]",
-        "user:[% spce_test.testuser1003.uuid %]",
+        "user:[% incoming_peer_scenarios_lnp_test.testuser1003.uuid %]",
         "totalaccountout:[% customer_test.id %]",
-        "totaluserout:[% spce_test.testuser1003.uuid %]",
+        "totaluserout:[% incoming_peer_scenarios_lnp_test.testuser1003.uuid %]",
         "totalaccount:[% customer_test.id %]",
-        "totaluser:[% spce_test.testuser1003.uuid %]",
+        "totaluser:[% incoming_peer_scenarios_lnp_test.testuser1003.uuid %]",
         "relay",
-        "peerout:[% peer_01_host1.id %]",
-        "peer:[% peer_01_host1.id %]",
+        "peerout:[% peer_incoming_peer_01_host1.id %]",
+        "peer:[% peer_incoming_peer_01_host1.id %]",
         "outgoing"
       ]
 sip_in:
-  - '^INVITE sip:4311003@'
+  - '^INVITE sip:[% extra_info.phone_numbers.0 %]@'
   - 'P-HIH-Cause: 302'
   - 'P-From-Peer: 1'
-  - 'P-Caller-UUID: [% spce_test.testuser1003.uuid %]'
-  - 'P-First-Caller-UPN: 004321001'
-  - 'P-First-Caller-NPN: 004321001'
+  - 'P-Caller-UUID: [% incoming_peer_scenarios_lnp_test.testuser1003.uuid %]'
+  - 'P-First-Caller-UPN: [% scenarios.0.username %]'
+  - 'P-First-Caller-NPN: [% scenarios.0.username %]'
   - 'P-Acc-Caller-User: testuser1001'
   - 'P-CF-Depth: 1'
-  - 'P-Orig-Callee-Dialed: 4311001'
+  - 'P-Orig-Callee-Dialed: [% incoming_peer_scenarios_lnp_test.testuser1001.phone_number %]'
 sip_out:
   - [
       '^SIP/2.0 100 Trying',
       'CSeq: \d+ INVITE',
-      'From: <sip:004321001@',
-      'To: <sip:4311001@'
+      'From: <sip:[% scenarios.0.username %]@',
+      'To: <sip:[% incoming_peer_scenarios_lnp_test.testuser1001.phone_number %]@'
     ]
   - [
-      '^INVITE sip:4318881003@',
+      '^INVITE sip:[% extra_info.phone_numbers.1 %]@',
       'CSeq: \d+ INVITE',
-      'From: <sip:004321001@',
+      'From: <sip:[% scenarios.0.username %]@',
       'Contact: <sip:127.0.0.1:5080(;transport=udp)?>',
-      'To: <sip:4311001@',
+      'To: <sip:[% incoming_peer_scenarios_lnp_test.testuser1001.phone_number %]@',
       'Content-Type: application/sdp',
       'P-CF-Depth: 1',
       'P-Callee-UUID: 0',
-      'P-Asserted-Identity: <sip:004321001@',
-      'P-Called-Party-ID: <sip:4318881003@',
+      'P-Asserted-Identity: <sip:[% scenarios.0.username %]@',
+      'P-Called-Party-ID: <sip:[% extra_info.phone_numbers.1 %]@',
       'P-App-Param: ;calltimer=21600;aleg_sst_enable=no;sst_enable=no',
       'P-App-Name: sbc'
     ]
diff --git a/scenarios_lnp/incoming_peer/0004_test.yml.tt2 b/scenarios_lnp/incoming_peer/0004_test.yml.tt2
index 12e56d3c..ac12fd5c 100644
--- a/scenarios_lnp/incoming_peer/0004_test.yml.tt2
+++ b/scenarios_lnp/incoming_peer/0004_test.yml.tt2
@@ -13,39 +13,39 @@ flow:
   - return|ROUTE_RUNTIME:
   - exit|ROUTE_EXIT:
 sip_in:
-  - 'INVITE sip:4318881003@127.1.0.1:\d+;transport=udp SIP/2.0'
-  - 'From: <sip:004321001@spce.test>;tag=[\w-]+'
-  - 'To: <sip:4318881003@127.1.0.1>'
+  - 'INVITE sip:[% extra_info.phone_numbers.1 %]@[% scenarios.0.responders.0.ip %]:[% scenarios.0.responders.0.port %];transport=udp SIP/2.0'
+  - 'From: <sip:[% scenarios.0.username %]@incoming-peer.scenarios-lnp.test>;tag=[\w-]+'
+  - 'To: <sip:[% extra_info.phone_numbers.1 %]@[% scenarios.0.responders.0.ip %]>'
   - 'CSeq: \d+ INVITE'
-  - 'P-Caller-UUID: [% spce_test.testuser1001.uuid %]'
-  - 'P-NGCP-Caller-Info: <sip:testuser1001@spce.test>;ip=127.0.0.1;port=508[08];primary=4311001'
-  - 'P-NGCP-Forward-Info: <sip:4311001@spce.test>;ip=127.0.0.1;port=508[08];primary=4311001'
-  - 'P-NGCP-Callee-Info: <sip:4311003@spce.test>;ip=127.1.0.1;port=\d+'
-  - 'P-Asserted-Identity: <sip:004321001@127.0.2.1>'
-  - 'P-D-Uri: sip:127.0.0.1:5060;received=sip:127.1.0.1:\d+%3blr%3btransport%3dudp'
+  - 'P-Caller-UUID: [% incoming_peer_scenarios_lnp_test.testuser1001.uuid %]'
+  - 'P-NGCP-Caller-Info: <sip:testuser1001@incoming-peer.scenarios-lnp.test>;ip=127.0.0.1;port=508[08];primary=[% incoming_peer_scenarios_lnp_test.testuser1001.phone_number %]'
+  - 'P-NGCP-Forward-Info: <sip:[% incoming_peer_scenarios_lnp_test.testuser1001.phone_number %]@incoming-peer.scenarios-lnp.test>;ip=127.0.0.1;port=508[08];primary=[% incoming_peer_scenarios_lnp_test.testuser1001.phone_number %]'
+  - 'P-NGCP-Callee-Info: <sip:[% extra_info.phone_numbers.0 %]@incoming-peer.scenarios-lnp.test>;ip=[% scenarios.0.responders.0.ip %];port=[% scenarios.0.responders.0.port %]'
+  - 'P-Asserted-Identity: <sip:[% scenarios.0.username %]@[% scenarios.0.ip %]>'
+  - 'P-D-Uri: sip:127.0.0.1:5060;received=sip:[% scenarios.0.responders.0.ip %]:[% scenarios.0.responders.0.port %]%3blr%3btransport%3dudp'
   - 'Content-Type: application/sdp'
   - 'Contact: <sip:127.0.0.1:508[08];transport=udp>'
   - 'Content-Length:\s+\d+'
 sip_out:
   - [
       'SIP/2.0 100 Trying',
-      'From: <sip:004321001@spce.test>;tag=[\w-]+',
-      'To: <sip:4318881003@127.1.0.1>',
+      'From: <sip:[% scenarios.0.username %]@incoming-peer.scenarios-lnp.test>;tag=[\w-]+',
+      'To: <sip:[% extra_info.phone_numbers.1 %]@[% scenarios.0.responders.0.ip %]>',
       'CSeq: \d+ INVITE',
       'Server: Sipwise NGCP Proxy',
       'Content-Length: 0',
     ]
   - [
-      'INVITE sip:4318881003@127.1.0.1:\d+;transport=udp SIP/2.0',
-      'From: <sip:004321001@spce.test>;tag=[\w-]+',
-      'To: <sip:4318881003@127.1.0.1>',
+      'INVITE sip:[% extra_info.phone_numbers.1 %]@[% scenarios.0.responders.0.ip %]:[% scenarios.0.responders.0.port %];transport=udp SIP/2.0',
+      'From: <sip:[% scenarios.0.username %]@incoming-peer.scenarios-lnp.test>;tag=[\w-]+',
+      'To: <sip:[% extra_info.phone_numbers.1 %]@[% scenarios.0.responders.0.ip %]>',
       'CSeq: \d+ INVITE',
-      'P-Caller-UUID: [% spce_test.testuser1001.uuid %]',
-      'P-NGCP-Caller-Info: <sip:testuser1001@spce.test>;ip=127.0.0.1;port=508[08];primary=4311001',
-      'P-NGCP-Forward-Info: <sip:4311001@spce.test>;ip=127.0.0.1;port=508[08];primary=4311001',
-      'P-NGCP-Callee-Info: <sip:4311003@spce.test>;ip=127.1.0.1;port=\d+',
-      'P-Asserted-Identity: <sip:004321001@127.0.2.1>',
-      'P-D-Uri: sip:127.0.0.1:5060;received=sip:127.1.0.1:\d+%3blr%3btransport%3dudp',
+      'P-Caller-UUID: [% incoming_peer_scenarios_lnp_test.testuser1001.uuid %]',
+      'P-NGCP-Caller-Info: <sip:testuser1001@incoming-peer.scenarios-lnp.test>;ip=127.0.0.1;port=508[08];primary=[% incoming_peer_scenarios_lnp_test.testuser1001.phone_number %]',
+      'P-NGCP-Forward-Info: <sip:[% incoming_peer_scenarios_lnp_test.testuser1001.phone_number %]@incoming-peer.scenarios-lnp.test>;ip=127.0.0.1;port=508[08];primary=[% incoming_peer_scenarios_lnp_test.testuser1001.phone_number %]',
+      'P-NGCP-Callee-Info: <sip:[% extra_info.phone_numbers.0 %]@incoming-peer.scenarios-lnp.test>;ip=[% scenarios.0.responders.0.ip %];port=[% scenarios.0.responders.0.port %]',
+      'P-Asserted-Identity: <sip:[% scenarios.0.username %]@[% scenarios.0.ip %]>',
+      'P-D-Uri: sip:127.0.0.1:5060;received=sip:[% scenarios.0.responders.0.ip %]:[% scenarios.0.responders.0.port %]%3blr%3btransport%3dudp',
       'Content-Type: application/sdp',
       'Contact: <sip:127.0.0.1:508[08];transport=udp>',
       'Content-Length:\s+\d+',
diff --git a/scenarios_lnp/incoming_peer/0008_test.yml.tt2 b/scenarios_lnp/incoming_peer/0008_test.yml.tt2
index 8cf94aba..ad873e4b 100644
--- a/scenarios_lnp/incoming_peer/0008_test.yml.tt2
+++ b/scenarios_lnp/incoming_peer/0008_test.yml.tt2
@@ -5,16 +5,16 @@ flow:
   - return|ROUTE_ENTRY:
       $avp(lua_dlg_profile): [
         "accountout:[% customer_test.id %]",
-        "userout:[% spce_test.testuser1003.uuid %]",
+        "userout:[% incoming_peer_scenarios_lnp_test.testuser1003.uuid %]",
         "account:[% customer_test.id %]",
-        "user:[% spce_test.testuser1003.uuid %]",
+        "user:[% incoming_peer_scenarios_lnp_test.testuser1003.uuid %]",
         "totalaccountout:[% customer_test.id %]",
-        "totaluserout:[% spce_test.testuser1003.uuid %]",
+        "totaluserout:[% incoming_peer_scenarios_lnp_test.testuser1003.uuid %]",
         "totalaccount:[% customer_test.id %]",
-        "totaluser:[% spce_test.testuser1003.uuid %]",
+        "totaluser:[% incoming_peer_scenarios_lnp_test.testuser1003.uuid %]",
         "relay",
-        "peerout:[% peer_01_host1.id %]",
-        "peer:[% peer_01_host1.id %]",
+        "peerout:[% peer_incoming_peer_01_host1.id %]",
+        "peer:[% peer_incoming_peer_01_host1.id %]",
         "outgoing"
       ]
   - start|ROUTE_PREPARE_UA:
@@ -27,12 +27,12 @@ flow:
 sip_in:
   - '^SIP/2.0 180 Ringing'
   - 'CSeq: \d+ INVITE'
-  - 'From: <sip:004321001@'
-  - 'To: <sip:4311001@'
+  - 'From: <sip:[% scenarios.0.username %]@'
+  - 'To: <sip:[% incoming_peer_scenarios_lnp_test.testuser1001.phone_number %]@'
 sip_out:
   - [
       '^SIP/2.0 180 Ringing',
       'CSeq: \d+ INVITE',
-      'From: <sip:004321001@',
-      'To: <sip:4311001@',
+      'From: <sip:[% scenarios.0.username %]@',
+      'To: <sip:[% incoming_peer_scenarios_lnp_test.testuser1001.phone_number %]@',
     ]
diff --git a/scenarios_lnp/incoming_peer/0011_test.yml.tt2 b/scenarios_lnp/incoming_peer/0011_test.yml.tt2
index d36dd9de..38e393db 100644
--- a/scenarios_lnp/incoming_peer/0011_test.yml.tt2
+++ b/scenarios_lnp/incoming_peer/0011_test.yml.tt2
@@ -15,28 +15,28 @@ flow:
   - return|dialog:start:
       $avp(lua_dlg_profile): [
         "accountout:[% customer_test.id %]",
-        "userout:[% spce_test.testuser1003.uuid %]",
+        "userout:[% incoming_peer_scenarios_lnp_test.testuser1003.uuid %]",
         "account:[% customer_test.id %]",
-        "user:[% spce_test.testuser1003.uuid %]",
+        "user:[% incoming_peer_scenarios_lnp_test.testuser1003.uuid %]",
         "totalaccountout:[% customer_test.id %]",
-        "totaluserout:[% spce_test.testuser1003.uuid %]",
+        "totaluserout:[% incoming_peer_scenarios_lnp_test.testuser1003.uuid %]",
         "totalaccount:[% customer_test.id %]",
-        "totaluser:[% spce_test.testuser1003.uuid %]",
+        "totaluser:[% incoming_peer_scenarios_lnp_test.testuser1003.uuid %]",
         "relay",
-        "peerout:[% peer_01_host1.id %]",
-        "peer:[% peer_01_host1.id %]",
+        "peerout:[% peer_incoming_peer_01_host1.id %]",
+        "peer:[% peer_incoming_peer_01_host1.id %]",
         "outgoing"
       ]
   - return|dialog:start:
 sip_in:
   - '^SIP/2.0 200 OK'
   - 'CSeq: \d+ INVITE'
-  - 'From: <sip:004321001@'
-  - 'To: <sip:4311001@'
+  - 'From: <sip:[% scenarios.0.username %]@'
+  - 'To: <sip:[% incoming_peer_scenarios_lnp_test.testuser1001.phone_number %]@'
 sip_out:
   - [
       '^SIP/2.0 200 OK',
       'CSeq: \d+ INVITE',
-      'From: <sip:004321001@',
-      'To: <sip:4311001@',
+      'From: <sip:[% scenarios.0.username %]@',
+      'To: <sip:[% incoming_peer_scenarios_lnp_test.testuser1001.phone_number %]@',
     ]
diff --git a/scenarios_lnp/incoming_peer/0012_test.yml.tt2 b/scenarios_lnp/incoming_peer/0012_test.yml.tt2
index 9973bcf3..0512b5e9 100644
--- a/scenarios_lnp/incoming_peer/0012_test.yml.tt2
+++ b/scenarios_lnp/incoming_peer/0012_test.yml.tt2
@@ -14,22 +14,22 @@ flow:
   - return|dialog:start:
       $avp(lua_dlg_profile): [
         "totalaccount:[% customer_test.id %]",
-        "totaluser:[% spce_test.testuser1003.uuid %]",
+        "totaluser:[% incoming_peer_scenarios_lnp_test.testuser1003.uuid %]",
         "account:[% customer_test.id %]",
-        "user:[% spce_test.testuser1003.uuid %]",
-        "peer:[% peer_00_host0.id %]",
+        "user:[% incoming_peer_scenarios_lnp_test.testuser1003.uuid %]",
+        "peer:[% peer_incoming_peer_00_host0.id %]",
         "total"
       ]
   - return|dialog:start:
 sip_in:
   - '^SIP/2.0 200 OK'
   - 'CSeq: 1 INVITE'
-  - 'From: <sip:004321001@'
-  - 'To: <sip:4311001@'
+  - 'From: <sip:[% scenarios.0.username %]@'
+  - 'To: <sip:[% incoming_peer_scenarios_lnp_test.testuser1001.phone_number %]@'
 sip_out:
   - [
       '^SIP/2.0 200 OK',
       'CSeq: 1 INVITE',
-      'From: <sip:004321001@',
-      'To: <sip:4311001@',
+      'From: <sip:[% scenarios.0.username %]@',
+      'To: <sip:[% incoming_peer_scenarios_lnp_test.testuser1001.phone_number %]@',
     ]
diff --git a/scenarios_lnp/incoming_peer/0014_test.yml.tt2 b/scenarios_lnp/incoming_peer/0014_test.yml.tt2
index 12e26087..d493152f 100644
--- a/scenarios_lnp/incoming_peer/0014_test.yml.tt2
+++ b/scenarios_lnp/incoming_peer/0014_test.yml.tt2
@@ -24,14 +24,14 @@ flow:
   - return|ROUTE_RUNTIME:
   - exit|ROUTE_EXIT:
 sip_in:
-  - '^ACK sip:(4318881003@)?127.0.0.1:5080(;transport=udp)? SIP/2.0'
+  - '^ACK sip:([% extra_info.phone_numbers.1 %]@)?127.0.0.1:5080(;transport=udp)? SIP/2.0'
   - 'CSeq: \d+ ACK'
-  - 'From: <sip:004321001@'
-  - 'To: <sip:4311001@'
+  - 'From: <sip:[% scenarios.0.username %]@'
+  - 'To: <sip:[% incoming_peer_scenarios_lnp_test.testuser1001.phone_number %]@'
 sip_out:
   - [
-      '^ACK sip:(4318881003@)?127.0.0.1:5080(;transport=udp)? SIP/2.0',
+      '^ACK sip:([% extra_info.phone_numbers.1 %]@)?127.0.0.1:5080(;transport=udp)? SIP/2.0',
       'CSeq: \d+ ACK',
-      'From: <sip:004321001@',
-      'To: <sip:4311001@'
+      'From: <sip:[% scenarios.0.username %]@',
+      'To: <sip:[% incoming_peer_scenarios_lnp_test.testuser1001.phone_number %]@'
     ]
diff --git a/scenarios_lnp/incoming_peer/0016_test.yml.tt2 b/scenarios_lnp/incoming_peer/0016_test.yml.tt2
index 3aa73f81..dc210875 100644
--- a/scenarios_lnp/incoming_peer/0016_test.yml.tt2
+++ b/scenarios_lnp/incoming_peer/0016_test.yml.tt2
@@ -27,27 +27,27 @@ flow:
   - exit|ROUTE_EXIT:
 sip_in:
   - '^BYE sip:127.0.0.1:5080(;prxroute=1)? SIP/2.0'
-  - 'Contact: sip:004321001@'
+  - 'Contact: sip:[% scenarios.0.username %]@'
   - 'CSeq: 2 BYE'
   - 'Max-Forwards: 69'
   - 'Content-Length: 0'
-  - 'From: <sip:004321001@'
-  - 'To: <sip:4311001@'
+  - 'From: <sip:[% scenarios.0.username %]@'
+  - 'To: <sip:[% incoming_peer_scenarios_lnp_test.testuser1001.phone_number %]@'
 
 sip_out:
   - [
       '^SIP/2.0 100 Trying',
       'CSeq: 2 BYE',
       'Content-Length: 0',
-      'From: <sip:004321001@',
-      'To: <sip:4311001@'
+      'From: <sip:[% scenarios.0.username %]@',
+      'To: <sip:[% incoming_peer_scenarios_lnp_test.testuser1001.phone_number %]@'
     ]
   - [
       '^BYE sip:127.0.0.1:5080(;prxroute=1)? SIP/2.0',
-      'Contact: sip:004321001@',
+      'Contact: sip:[% scenarios.0.username %]@',
       'CSeq: 2 BYE',
       'Max-Forwards: 68',
       'Content-Length: 0',
-      'From: <sip:004321001@',
-      'To: <sip:4311001@'
+      'From: <sip:[% scenarios.0.username %]@',
+      'To: <sip:[% incoming_peer_scenarios_lnp_test.testuser1001.phone_number %]@'
     ]
diff --git a/scenarios_lnp/incoming_peer/0020_test.yml.tt2 b/scenarios_lnp/incoming_peer/0020_test.yml.tt2
index 91e63e20..17c8716d 100644
--- a/scenarios_lnp/incoming_peer/0020_test.yml.tt2
+++ b/scenarios_lnp/incoming_peer/0020_test.yml.tt2
@@ -16,13 +16,13 @@ sip_in:
   - '^SIP/2.0 200 OK'
   - 'CSeq: \d+ BYE'
   - 'Content-Length: 0'
-  - 'From: <sip:004321001@'
-  - 'To: <sip:4311001@'
+  - 'From: <sip:[% scenarios.0.username %]@'
+  - 'To: <sip:[% incoming_peer_scenarios_lnp_test.testuser1001.phone_number %]@'
 sip_out:
   - [
       '^SIP/2.0 200 OK',
       'CSeq: \d+ BYE',
       'Content-Length: 0',
-      'From: <sip:004321001@',
-      'To: <sip:4311001@'
+      'From: <sip:[% scenarios.0.username %]@',
+      'To: <sip:[% incoming_peer_scenarios_lnp_test.testuser1001.phone_number %]@'
     ]
diff --git a/scenarios_lnp/incoming_peer/0021_test.yml.tt2 b/scenarios_lnp/incoming_peer/0021_test.yml.tt2
index 1fc59ab8..a5ef21e7 100644
--- a/scenarios_lnp/incoming_peer/0021_test.yml.tt2
+++ b/scenarios_lnp/incoming_peer/0021_test.yml.tt2
@@ -16,13 +16,13 @@ sip_in:
   - '^SIP/2.0 200 OK'
   - 'CSeq: 2 BYE'
   - 'Content-Length: 0'
-  - 'From: <sip:004321001@'
-  - 'To: <sip:4311001@'
+  - 'From: <sip:[% scenarios.0.username %]@'
+  - 'To: <sip:[% incoming_peer_scenarios_lnp_test.testuser1001.phone_number %]@'
 sip_out:
   - [
       '^SIP/2.0 200 OK',
       'CSeq: 2 BYE',
       'Content-Length: 0',
-      'From: <sip:004321001@',
-      'To: <sip:4311001@'
+      'From: <sip:[% scenarios.0.username %]@',
+      'To: <sip:[% incoming_peer_scenarios_lnp_test.testuser1001.phone_number %]@'
     ]
diff --git a/scenarios_lnp/incoming_peer/callforward.yml b/scenarios_lnp/incoming_peer/callforward.yml.tt2
similarity index 69%
rename from scenarios_lnp/incoming_peer/callforward.yml
rename to scenarios_lnp/incoming_peer/callforward.yml.tt2
index 0e8fcff8..45d5e315 100644
--- a/scenarios_lnp/incoming_peer/callforward.yml
+++ b/scenarios_lnp/incoming_peer/callforward.yml.tt2
@@ -1,8 +1,8 @@
 ---
-testuser1001@spce.test:
+testuser1001@incoming-peer.scenarios-lnp.test:
   destinations:
     destinations:
-      - destination: sip:4311003@spce.test
+      - destination: sip:[% extra_info.phone_numbers.0 %]@incoming-peer.scenarios-lnp.test
         priority: 0
         timeout: 5
     name: dest1001
diff --git a/scenarios_lnp/incoming_peer/cdr_test.yml.tt2 b/scenarios_lnp/incoming_peer/cdr_test.yml.tt2
index 7479b83d..c3519bd7 100644
--- a/scenarios_lnp/incoming_peer/cdr_test.yml.tt2
+++ b/scenarios_lnp/incoming_peer/cdr_test.yml.tt2
@@ -1,19 +1,19 @@
 cdr:
-  - source_user: '004321001'
-    source_domain: '127.0.2.1'
-    source_cli: '004321001'
+  - source_user: '[% scenarios.0.username %]'
+    source_domain: '[% scenarios.0.ip %]'
+    source_cli: '[% scenarios.0.username %]'
     destination_user: 'testuser1001'
-    destination_domain: 'spce.test'
-    destination_user_dialed: '4311001'
+    destination_domain: 'incoming-peer.scenarios-lnp.test'
+    destination_user_dialed: '[% incoming_peer_scenarios_lnp_test.testuser1001.phone_number %]'
     call_type: 'call'
     call_status: 'ok'
     call_code: '200'
   - source_user: 'testuser1001'
-    source_domain: 'spce.test'
-    source_cli: '4311001'
-    destination_user: '4318881003'
-    destination_domain: '127.1.0.1'
-    destination_user_dialed: '4311003'
+    source_domain: 'incoming-peer.scenarios-lnp.test'
+    source_cli: '[% incoming_peer_scenarios_lnp_test.testuser1001.phone_number %]'
+    destination_user: '[% extra_info.phone_numbers.1 %]'
+    destination_domain: '[% scenarios.0.responders.0.ip %]'
+    destination_user_dialed: '[% extra_info.phone_numbers.0 %]'
     call_type: 'cfu'
     call_status: 'ok'
     call_code: '200'
\ No newline at end of file
diff --git a/scenarios_lnp/incoming_peer/lnp.yml b/scenarios_lnp/incoming_peer/lnp.yml
deleted file mode 100644
index dffe14ce..00000000
--- a/scenarios_lnp/incoming_peer/lnp.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-lnp_test_00:
-  data:
-    name: lnp_test_00
-    prefix: test
-  numbers:
-    - number: '4311003'
-      routing_number: '4318881003'
diff --git a/scenarios_lnp/incoming_peer/lnp.yml.tt2 b/scenarios_lnp/incoming_peer/lnp.yml.tt2
new file mode 100644
index 00000000..5d22cf8f
--- /dev/null
+++ b/scenarios_lnp/incoming_peer/lnp.yml.tt2
@@ -0,0 +1,8 @@
+---
+lnp_incoming_peer_00:
+  data:
+    name: lnp_incoming_peer_00
+    prefix: test
+  numbers:
+    - number: '[% extra_info.phone_numbers.0 %]'
+      routing_number: '[% extra_info.phone_numbers.1 %]'
diff --git a/scenarios_lnp/incoming_peer/peer.yml b/scenarios_lnp/incoming_peer/peer.yml
index ef6bc222..e4a06885 100644
--- a/scenarios_lnp/incoming_peer/peer.yml
+++ b/scenarios_lnp/incoming_peer/peer.yml
@@ -1,51 +1,51 @@
 ---
-peer_00:
+peer_incoming_peer_00:
   contact:
-    company: peer_00
-    email: peer_00@host0.not
+    company: peer_incoming_peer_00
+    email: peer_incoming_peer_00@host0.not
   contract:
     billing_profile_id: 1
     status: active
     type: sippeering
   groups:
-    - name: peer_00_group
+    - name: peer_incoming_peer_00_group
       priority: 1
       description:
   inboundrules:
-    - group_id: peer_00_group
+    - group_id: peer_incoming_peer_00_group
       field: "ruri_uri"
       pattern: '.*'
       priority: 50
       enabled: 1
   hosts:
-    - group_id: peer_00_group
-      name: peer_00_host0
+    - group_id: peer_incoming_peer_00_group
+      name: peer_incoming_peer_00_host0
       ip: 127.0.2.1
       port: 51602
       host:
       transport: 1
       weight: 1
-peer_01:
+peer_incoming_peer_01:
   contact:
-    company: peer_01
-    email: peer_01@host1.not
+    company: peer_incoming_peer_01
+    email: peer_incoming_peer_01@host1.not
   contract:
     billing_profile_id: 1
     status: active
     type: sippeering
   groups:
-    - name: peer_01_group
+    - name: peer_incoming_peer_01_group
       priority: 1
       description:
   rules:
-    - group_id: peer_01_group
+    - group_id: peer_incoming_peer_01_group
       callee_prefix: ""
       callee_pattern: ''
-      caller_pattern: '^sip:.+@spce.test'
+      caller_pattern: '^sip:.+@incoming-peer.scenarios-lnp.test'
       description: ""
   hosts:
-    - group_id: peer_01_group
-      name: peer_01_host1
+    - group_id: peer_incoming_peer_01_group
+      name: peer_incoming_peer_01_host1
       ip: 127.1.0.1
       port: 51602
       host:
diff --git a/scenarios_lnp/incoming_peer/prefs.json b/scenarios_lnp/incoming_peer/prefs.json.tt2
similarity index 55%
rename from scenarios_lnp/incoming_peer/prefs.json
rename to scenarios_lnp/incoming_peer/prefs.json.tt2
index 790526d2..4431f44d 100644
--- a/scenarios_lnp/incoming_peer/prefs.json
+++ b/scenarios_lnp/incoming_peer/prefs.json.tt2
@@ -1,10 +1,10 @@
 {
-    "peer_00_host0": {
+    "peer_incoming_peer_00_host0": {
     	"lnp_add_npdi": true,
     	"lnp_to_rn": true,
         "concurrent_max": 1
     },
-    "testuser1001@spce.test": {
+    "testuser1001@incoming-peer.scenarios-lnp.test": {
         "lock": 5
     }
 }
diff --git a/scenarios_lnp/incoming_peer/scenario.yml b/scenarios_lnp/incoming_peer/scenario.yml
index 58f7a962..0cb202a4 100644
--- a/scenarios_lnp/incoming_peer/scenario.yml
+++ b/scenarios_lnp/incoming_peer/scenario.yml
@@ -1,6 +1,7 @@
+---
 test_uuid: incoming_peer
 domains:
-  'spce.test':
+  incoming-peer.scenarios-lnp.test:
     reseller_id: 1
 customers:
   'customer.test':
@@ -13,7 +14,7 @@ customers:
       billing_profile_id: 1
       reseller_id: 1
 subscribers:
-  spce.test:
+  incoming-peer.scenarios-lnp.test:
     testuser1001:
       customer: 'customer.test'
       password: testuser
@@ -24,10 +25,14 @@ scenarios:
   - ip: 127.0.2.1
     username: 004321001
     domain: 127.0.2.1
+    peer_host: peer_incoming_peer_00_host0
     responders:
       - ip: 127.1.0.1
-        number: 4311001
-        username: 4311001
-        domain: spce.test
-        peer_host: peer_01_host1
-        register: no
+        username: testuser1001
+        domain: incoming-peer.scenarios-lnp.test
+        peer_host: peer_incoming_peer_01_host1
+        register: 'no'
+extra_info:
+  phone_numbers:
+    - 4341003
+    - 4318881003