diff --git a/scenarios_lnp/incoming_peer_unallocated_authoritative/0001_test.yml.tt2 b/scenarios_lnp/incoming_peer_unallocated_authoritative/0001_test.yml.tt2
index b1cfed6d..89b22a19 100644
--- a/scenarios_lnp/incoming_peer_unallocated_authoritative/0001_test.yml.tt2
+++ b/scenarios_lnp/incoming_peer_unallocated_authoritative/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_ua_00_host0.id %]", "total"]
   - return|ROUTE_FIND_CALLER:
   - start|ROUTE_APPLY_HEADER_RULES:
   - return|ROUTE_APPLY_HEADER_RULES:
@@ -73,35 +73,35 @@ flow:
   - return|ROUTE_RUNTIME:
   - exit|ROUTE_EXIT:
 sip_in:
-  - '^INVITE sip:4321001@'
-  - 'From: <sip:004411001@127.0.2.1>'
-  - 'To: <sip:4321001@'
+  - '^INVITE sip:[% extra_info.phone_numbers.0 %]@'
+  - 'From: <sip:[% scenarios.0.username %]@[% scenarios.0.domain %]>'
+  - 'To: <sip:[% extra_info.phone_numbers.0 %]@'
   - 'CSeq: 1 INVITE'
   - 'Max-Forwards: 69'
   - 'Content-Type: application/sdp'
-  - 'P-NGCP-Src-Ip: 127.0.2.1'
-  - 'P-NGCP-Src-Port: \d+'
+  - 'P-NGCP-Src-Ip: [% scenarios.0.ip %]'
+  - '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'
 sip_out:
   - [
       '^SIP/2.0 100 Trying',
-      'From: <sip:004411001@127.0.2.1>',
-      'To: <sip:4321001',
+      'From: <sip:[% scenarios.0.username %]@[% scenarios.0.domain %]>',
+      'To: <sip:[% extra_info.phone_numbers.0 %]',
       'CSeq: 1 INVITE',
       'P-Out-Socket: udp:127.0.0.1:5060',
-      'P-NGCP-Auth-IP: 127.0.2.1',
+      'P-NGCP-Auth-IP: [% scenarios.0.ip %]',
       'Content-Length:\s+0'
     ]
   - [
       '^SIP/2.0 404 Not Found',
-      'From: <sip:004411001@127.0.2.1>',
-      'To: <sip:4321001@',
+      'From: <sip:[% scenarios.0.username %]@[% scenarios.0.domain %]>',
+      'To: <sip:[% extra_info.phone_numbers.0 %]@',
       'CSeq: 1 INVITE',
       'P-Out-Socket: udp:127.0.0.1:5060',
-      'P-NGCP-Auth-IP: 127.0.2.1',
-      'P-NGCP-Caller-Info: <sip:004411001@127.0.2.1>;ip=127.0.2.1;port=\d+',
-      'P-NGCP-Callee-Info: <sip:4321001@spce.test>;ip=spce.test;port=5060',
+      'P-NGCP-Auth-IP: [% scenarios.0.ip %]',
+      'P-NGCP-Caller-Info: <sip:[% scenarios.0.username %]@[% scenarios.0.ip %]>;ip=[% scenarios.0.ip %];port=[% scenarios.0.port %]',
+      'P-NGCP-Callee-Info: <sip:[% extra_info.phone_numbers.0 %]@incoming-peer-unallocated-authoritative.scenarios-lnp.test>;ip=incoming-peer-unallocated-authoritative.scenarios-lnp.test;port=5060',
       'Content-Length:\s+0'
     ]
diff --git a/scenarios_lnp/incoming_peer_unallocated_authoritative/0002_test.yml.tt2 b/scenarios_lnp/incoming_peer_unallocated_authoritative/0002_test.yml.tt2
index ac01d897..20e95462 100644
--- a/scenarios_lnp/incoming_peer_unallocated_authoritative/0002_test.yml.tt2
+++ b/scenarios_lnp/incoming_peer_unallocated_authoritative/0002_test.yml.tt2
@@ -12,9 +12,9 @@ flow:
   - start|ROUTE_LOCAL:
   - return|ROUTE_LOCAL:
 sip_in:
-  - '^ACK sip:4321001@'
-  - 'From: <sip:004411001@127.0.2.1>'
-  - 'To: <sip:4321001@'
+  - '^ACK sip:[% extra_info.phone_numbers.0 %]@'
+  - 'From: <sip:[% scenarios.0.username %]@[% scenarios.0.domain %]>'
+  - 'To: <sip:[% extra_info.phone_numbers.0 %]@'
   - 'CSeq: 1 ACK'
   - 'Max-Forwards: 69'
   - 'Content-Length:\s+0'
diff --git a/scenarios_lnp/incoming_peer_unallocated_authoritative/cdr_test.yml.tt2 b/scenarios_lnp/incoming_peer_unallocated_authoritative/cdr_test.yml.tt2
index aea6f68f..4f91ebe8 100644
--- a/scenarios_lnp/incoming_peer_unallocated_authoritative/cdr_test.yml.tt2
+++ b/scenarios_lnp/incoming_peer_unallocated_authoritative/cdr_test.yml.tt2
@@ -1,10 +1,10 @@
 cdr:
-  - source_user: '004411001'
-    source_domain: '127.0.2.1'
-    source_cli: '004411001'
-    destination_user: '4321001'
-    destination_domain: 'spce.test'
-    destination_user_dialed: '4321001'
+  - source_user: '[% scenarios.0.username %]'
+    source_domain: '[% scenarios.0.ip %]'
+    source_cli: '[% scenarios.0.username %]'
+    destination_user: '[% extra_info.phone_numbers.0 %]'
+    destination_domain: 'incoming-peer-unallocated-authoritative.scenarios-lnp.test'
+    destination_user_dialed: '[% extra_info.phone_numbers.0 %]'
     call_type: 'call'
     call_status: 'offline'
     call_code: '404'
\ No newline at end of file
diff --git a/scenarios_lnp/incoming_peer_unallocated_authoritative/lnp.yml b/scenarios_lnp/incoming_peer_unallocated_authoritative/lnp.yml
deleted file mode 100644
index 5d286a11..00000000
--- a/scenarios_lnp/incoming_peer_unallocated_authoritative/lnp.yml
+++ /dev/null
@@ -1,9 +0,0 @@
----
-lnp_test_00:
-  data:
-    name: lnp_test_00
-    prefix: test
-    authoritative: 1
-  numbers:
-    - number: '4321001'
-      routing_number: '4318881003'
diff --git a/scenarios_lnp/incoming_peer_unallocated_authoritative/lnp.yml.tt2 b/scenarios_lnp/incoming_peer_unallocated_authoritative/lnp.yml.tt2
new file mode 100644
index 00000000..806c8d9e
--- /dev/null
+++ b/scenarios_lnp/incoming_peer_unallocated_authoritative/lnp.yml.tt2
@@ -0,0 +1,9 @@
+---
+lnp_test_00:
+  data:
+    name: lnp_test_00
+    prefix: test
+    authoritative: 1
+  numbers:
+    - number: '[% extra_info.phone_numbers.0 %]'
+      routing_number: '[% extra_info.phone_numbers.1 %]'
diff --git a/scenarios_lnp/incoming_peer_unallocated_authoritative/peer.yml b/scenarios_lnp/incoming_peer_unallocated_authoritative/peer.yml
index 0852a726..19cc1840 100644
--- a/scenarios_lnp/incoming_peer_unallocated_authoritative/peer.yml
+++ b/scenarios_lnp/incoming_peer_unallocated_authoritative/peer.yml
@@ -1,25 +1,25 @@
 ---
-peer_00:
+peer_incoming_peer_ua_00:
   contact:
-    company: peer_00
-    email: peer_00@host0.not
+    company: peer_incoming_peer_ua_00
+    email: peer_incoming_peer_ua_00@host0.not
   contract:
     billing_profile_id: 1
     status: active
     type: sippeering
   groups:
-    - name: peer_00_group
+    - name: peer_incoming_peer_ua_00_group
       priority: 1
       description:
   inboundrules:
-    - group_id: peer_00_group
+    - group_id: peer_incoming_peer_ua_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_ua_00_group
+      name: peer_incoming_peer_ua_00_host0
       ip: 127.0.2.1
       port: 51602
       host:
diff --git a/scenarios_lnp/incoming_peer_unallocated_authoritative/prefs.json b/scenarios_lnp/incoming_peer_unallocated_authoritative/prefs.json.tt2
similarity index 68%
rename from scenarios_lnp/incoming_peer_unallocated_authoritative/prefs.json
rename to scenarios_lnp/incoming_peer_unallocated_authoritative/prefs.json.tt2
index a4d623e6..8576aca1 100644
--- a/scenarios_lnp/incoming_peer_unallocated_authoritative/prefs.json
+++ b/scenarios_lnp/incoming_peer_unallocated_authoritative/prefs.json.tt2
@@ -1,5 +1,5 @@
 {
-    "peer_00_host0": {
+    "peer_incoming_peer_ua_00_host0": {
     	"lnp_add_npdi": true,
     	"lnp_to_rn": true,
         "concurrent_max": 1
diff --git a/scenarios_lnp/incoming_peer_unallocated_authoritative/scenario.yml b/scenarios_lnp/incoming_peer_unallocated_authoritative/scenario.yml
index 292f516b..07cd94b3 100644
--- a/scenarios_lnp/incoming_peer_unallocated_authoritative/scenario.yml
+++ b/scenarios_lnp/incoming_peer_unallocated_authoritative/scenario.yml
@@ -1,6 +1,7 @@
+---
 test_uuid: incoming_peer_unallocated_authoritative
 domains:
-  'spce.test':
+  'incoming-peer-unallocated-authoritative.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-unallocated-authoritative.scenarios-lnp.test:
     testuser1001:
       customer: 'customer.test'
       password: testuser
@@ -23,12 +24,17 @@ subscribers:
 scenarios:
   - ip: 127.0.2.1
     username: 004411001
-    domain: 127.0.2.1
+    domain: incoming-peer-unallocated-authoritative.host0.scenarios-lnp.test
+    peer_host: peer_incoming_peer_ua_00_host0
     responders:
       - ip: 127.1.0.1
         number: 4321001
         username: 4311001
-        domain: spce.test
-        peer_host: peer_01_host1
-        register: no
-        active: no
+        domain: incoming-peer-unallocated-authoritative.scenarios-lnp.test
+        peer_host: peer_incoming_peer_ua_01_host1
+        register: 'no'
+        active: 'no'
+extra_info:
+  phone_numbers:
+    - 4321001
+    - 4318881003