diff --git a/scenarios/incoming_peer/0003_test.yml.tt2 b/scenarios/incoming_peer/0003_test.yml.tt2
index c240a52d..3e097417 100644
--- a/scenarios/incoming_peer/0003_test.yml.tt2
+++ b/scenarios/incoming_peer/0003_test.yml.tt2
@@ -49,9 +49,9 @@ flow:
   - return|ROUTE_SET_CALLEE_DIALOG:
      $avp(lua_dlg_profile): [
         "totalaccount:[% customer_test.id %]",
-        "totaluser:[% spce_test.testuser1003.uuid %]",
+        "totaluser:[% incoming_peer.scenarios.test.testuser1003.uuid %]",
         "account:[% customer_test.id %]",
-        "user:[% spce_test.testuser1003.uuid %]",
+        "user:[% incoming_peer.scenarios.test.testuser1003.uuid %]",
         "peer:[% peer_00_host0.id %]",
         "total"
       ]
@@ -88,9 +88,9 @@ flow:
       $avp(lua_dlg_profile): [
         "incoming",
         "totalaccount:[% customer_test.id %]",
-        "totaluser:[% spce_test.testuser1003.uuid %]",
+        "totaluser:[% incoming_peer.scenarios.test.testuser1003.uuid %]",
         "account:[% customer_test.id %]",
-        "user:[% spce_test.testuser1003.uuid %]",
+        "user:[% incoming_peer.scenarios.test.testuser1003.uuid %]",
         "peer:[% peer_00_host0.id %]",
         "total"
       ]
@@ -164,15 +164,15 @@ flow:
       $avp(lua_dlg_profile): [
         "incoming",
         "totalaccount:[% customer_test.id %]",
-        "totaluser:[% spce_test.testuser1003.uuid %]",
+        "totaluser:[% incoming_peer.scenarios.test.testuser1003.uuid %]",
         "account:[% customer_test.id %]",
-        "user:[% spce_test.testuser1003.uuid %]",
+        "user:[% incoming_peer.scenarios.test.testuser1003.uuid %]",
         "peer:[% peer_00_host0.id %]",
         "total"
       ]
 sip_in:
-  - '^INVITE sip:4311003@'
-  - 'Contact: sip:004321001@'
+  - '^INVITE sip:[% incoming_peer_scenarios_test.testuser1003.phone_number %]@'
+  - 'Contact: sip:[% scenarios.0.username %]@'
   - 'CSeq: 1 INVITE'
   - 'Max-Forwards: 69'
   - 'Content-Type: application/sdp'
@@ -180,19 +180,19 @@ sip_out:
   - [
       '^SIP/2.0 100 Trying',
       'CSeq: 1 INVITE',
-      'From: <sip:004321001@',
-      'To: <sip:4311003@'
+      'From: <sip:[% scenarios.0.username %]@',
+      'To: <sip:[% incoming_peer_scenarios_test.testuser1003.phone_number %]@'
     ]
   - [
       '^INVITE sip:testuser1003@',
       'CSeq: 1 INVITE',
-      'From: <sip:004321001@',
-      'To: <sip:4311003@',
-      'Contact: sip:004321001@',
+      'From: <sip:[% scenarios.0.username %]@',
+      'To: <sip:[% incoming_peer_scenarios_test.testuser1003.phone_number %]@',
+      'Contact: sip:[% scenarios.0.username %]@',
       'Content-Type: application/sdp',
       'P-Caller-UUID: 0',
-      'P-Callee-UUID: \w+',
-      'P-Asserted-Identity: <sip:004321001@',
+      'P-Callee-UUID: [% incoming_peer_scenarios_test.testuser1003.uui %]',
+      'P-Asserted-Identity: <sip:[% scenarios.0.username %]@',
       'P-Called-Party-ID: <sip:testuser1003@',
       'P-App-Param: ;calltimer=21600;aleg_sst_enable=no;sst_enable=no',
       'P-App-Name: sbc'
diff --git a/scenarios/incoming_peer/0005_test.yml.tt2 b/scenarios/incoming_peer/0005_test.yml.tt2
index 478c5b7d..ffb64267 100644
--- a/scenarios/incoming_peer/0005_test.yml.tt2
+++ b/scenarios/incoming_peer/0005_test.yml.tt2
@@ -13,15 +13,15 @@ flow:
   - return|ROUTE_RUNTIME:
   - exit|ROUTE_EXIT:
 sip_in:
-  - 'INVITE sip:testuser1003@127.1.0.1:\d+ SIP/2.0'
-  - 'From: <sip:004321001@spce.test>;tag=[\w-]+'
-  - 'To: <sip:testuser1003@spce.test>'
+  - 'INVITE sip:testuser1003@[% scenarios.0.responders.0.ip %]:[% scenarios.0.responders.0.port %] SIP/2.0'
+  - 'From: <sip:[% scenarios.0.username %]@incoming-peer.scenarios.test>;tag=[\w-]+'
+  - 'To: <sip:testuser1003@incoming-peer.scenarios.test>'
   - 'CSeq: \d+ INVITE'
   - 'P-LB-Uptime: \d+'
-  - 'P-Asserted-Identity: <sip:004321001@spce.test>'
+  - 'P-Asserted-Identity: <sip:[% scenarios.0.username %]@incoming-peer.scenarios.test>'
   - 'P-Caller-UUID: 0'
-  - 'P-NGCP-Caller-Info: <sip:004321001@127.0.2.1>;ip=127.0.2.1;port=\d+'
-  - 'P-NGCP-Callee-Info: <sip:4311003@spce.test>;ip=127.0.0.1;port=5060;primary=4311003'
+  - 'P-NGCP-Caller-Info: <sip:[% scenarios.0.username %]@[% scenarios.0.ip %]>;ip=[% scenarios.0.ip %];port=[% scenarios.0.port %]'
+  - 'P-NGCP-Callee-Info: <sip:[% incoming_peer_scenarios_test.testuser1003.phone_number %]@incoming-peer.scenarios.test>;ip=127.0.0.1;port=5060;primary=[% incoming_peer_scenarios_test.testuser1003.phone_number %]'
   - 'P-D-Uri: sip:lb@127.0.0.1;lr;socket=sip:127.0.0.1:5060'
   - 'Content-Type: application/sdp'
   - 'Contact: <sip:127.0.0.1:508[08];transport=udp>'
@@ -29,22 +29,22 @@ sip_in:
 sip_out:
   - [
       'SIP/2.0 100 Trying',
-      'From: <sip:004321001@spce.test>;tag=[\w-]+',
-      'To: <sip:testuser1003@spce.test>',
+      'From: <sip:[% scenarios.0.username %]@incoming-peer.scenarios.test>;tag=[\w-]+',
+      'To: <sip:testuser1003@incoming-peer.scenarios.test>',
       'CSeq: \d+ INVITE',
       'Server: Sipwise NGCP Proxy',
       'Content-Length: 0',
     ]
   - [
-      'INVITE sip:testuser1003@127.1.0.1:\d+ SIP/2.0',
-      'From: <sip:004321001@spce.test>;tag=[\w-]+',
-      'To: <sip:testuser1003@spce.test>',
+      'INVITE sip:testuser1003@[% scenarios.0.responders.0.ip %]:[% scenarios.0.responders.0.port %] SIP/2.0',
+      'From: <sip:[% scenarios.0.username %]@incoming-peer.scenarios.test>;tag=[\w-]+',
+      'To: <sip:testuser1003@incoming-peer.scenarios.test>',
       'CSeq: \d+ INVITE',
       'P-LB-Uptime: \d+',
-      'P-Asserted-Identity: <sip:004321001@spce.test>',
+      'P-Asserted-Identity: <sip:[% scenarios.0.username %]@incoming-peer.scenarios.test>',
       'P-Caller-UUID: 0',
-      'P-NGCP-Caller-Info: <sip:004321001@127.0.2.1>;ip=127.0.2.1;port=\d+',
-      'P-NGCP-Callee-Info: <sip:4311003@spce.test>;ip=127.0.0.1;port=5060;primary=4311003',
+      'P-NGCP-Caller-Info: <sip:[% scenarios.0.username %]@[% scenarios.0.ip %]>;ip=[% scenarios.0.ip %];port=[% scenarios.0.port %]',
+      'P-NGCP-Callee-Info: <sip:[% incoming_peer_scenarios_test.testuser1003.phone_number %]@incoming-peer.scenarios.test>;ip=127.0.0.1;port=5060;primary=[% incoming_peer_scenarios_test.testuser1003.phone_number %]',
       'P-D-Uri: sip:lb@127.0.0.1;lr;socket=sip:127.0.0.1:5060',
       'Content-Type: application/sdp',
       'Contact: <sip:127.0.0.1:508[08];transport=udp>',
diff --git a/scenarios/incoming_peer/0010_test.yml.tt2 b/scenarios/incoming_peer/0010_test.yml.tt2
index 5d9922bd..577e2be6 100644
--- a/scenarios/incoming_peer/0010_test.yml.tt2
+++ b/scenarios/incoming_peer/0010_test.yml.tt2
@@ -18,9 +18,9 @@ flow:
       $avp(lua_dlg_profile): [
         "incoming",
         "totalaccount:[% customer_test.id %]",
-        "totaluser:[% spce_test.testuser1003.uuid %]",
+        "totaluser:[% incoming_peer.scenarios.test.testuser1003.uuid %]",
         "account:[% customer_test.id %]",
-        "user:[% spce_test.testuser1003.uuid %]",
+        "user:[% incoming_peer.scenarios.test.testuser1003.uuid %]",
         "peer:[% peer_00_host0.id %]",
         "total"
       ]
@@ -28,12 +28,12 @@ flow:
 sip_in:
   - '^SIP/2.0 200 OK'
   - 'CSeq: 1 INVITE'
-  - 'From: <sip:004321001@'
-  - 'To: <sip:4311003@'
+  - 'From: <sip:[% scenarios.0.username %]@'
+  - 'To: <sip:[% incoming_peer_scenarios_test.testuser1003.phone_number %]@'
 sip_out:
   - [
       '^SIP/2.0 200 OK',
       'CSeq: 1 INVITE',
-      'From: <sip:004321001@',
-      'To: <sip:4311003@',
+      'From: <sip:[% scenarios.0.username %]@',
+      'To: <sip:[% incoming_peer_scenarios_test.testuser1003.phone_number %]@',
     ]
diff --git a/scenarios/incoming_peer/0011_test.yml.tt2 b/scenarios/incoming_peer/0011_test.yml.tt2
index ca3671bc..9a6dcb69 100644
--- a/scenarios/incoming_peer/0011_test.yml.tt2
+++ b/scenarios/incoming_peer/0011_test.yml.tt2
@@ -26,12 +26,12 @@ flow:
 sip_in:
   - '^ACK sip:127.0.0.1:5080;prxroute=1 SIP/2.0'
   - 'CSeq: 1 ACK'
-  - 'From: <sip:004321001@'
-  - 'To: <sip:4311003@'
+  - 'From: <sip:[% scenarios.0.username %]@'
+  - 'To: <sip:[% incoming_peer_scenarios_test.testuser1003.phone_number %]@'
 sip_out:
   - [
       '^ACK sip:127.0.0.1:5080;prxroute=1 SIP/2.0',
       'CSeq: 1 ACK',
-      'From: <sip:004321001@',
-      'To: <sip:4311003@'
+      'From: <sip:[% scenarios.0.username %]@',
+      'To: <sip:[% incoming_peer_scenarios_test.testuser1003.phone_number %]@'
     ]
diff --git a/scenarios/incoming_peer/0013_test.yml.tt2 b/scenarios/incoming_peer/0013_test.yml.tt2
index 906e5c3e..6b3f1c57 100644
--- a/scenarios/incoming_peer/0013_test.yml.tt2
+++ b/scenarios/incoming_peer/0013_test.yml.tt2
@@ -30,27 +30,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:4311003@'
+  - 'From: <sip:[% scenarios.0.username %]@'
+  - 'To: <sip:[% incoming_peer_scenarios_test.testuser1003.phone_number %]@'
 
 sip_out:
   - [
       '^SIP/2.0 100 Trying',
       'CSeq: 2 BYE',
       'Content-Length: 0',
-      'From: <sip:004321001@',
-      'To: <sip:4311003@'
+      'From: <sip:[% scenarios.0.username %]@',
+      'To: <sip:[% incoming_peer_scenarios_test.testuser1003.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:4311003@'
+      'From: <sip:[% scenarios.0.username %]@',
+      'To: <sip:[% incoming_peer_scenarios_test.testuser1003.phone_number %]@'
     ]
diff --git a/scenarios/incoming_peer/0016_test.yml.tt2 b/scenarios/incoming_peer/0016_test.yml.tt2
index 7bd46d6e..eaaf48f6 100644
--- a/scenarios/incoming_peer/0016_test.yml.tt2
+++ b/scenarios/incoming_peer/0016_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:4311003@'
+  - 'From: <sip:[% scenarios.0.username %]@'
+  - 'To: <sip:[% incoming_peer_scenarios_test.testuser1003.phone_number %]@'
 sip_out:
   - [
       '^SIP/2.0 200 OK',
       'CSeq: 2 BYE',
       'Content-Length: 0',
-      'From: <sip:004321001@',
-      'To: <sip:4311003@'
+      'From: <sip:[% scenarios.0.username %]@',
+      'To: <sip:[% incoming_peer_scenarios_test.testuser1003.phone_number %]@'
     ]
diff --git a/scenarios/incoming_peer/cdr_test.yml.tt2 b/scenarios/incoming_peer/cdr_test.yml.tt2
index 4220883f..28268343 100644
--- a/scenarios/incoming_peer/cdr_test.yml.tt2
+++ b/scenarios/incoming_peer/cdr_test.yml.tt2
@@ -1,10 +1,10 @@
 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: 'testuser1003'
-    destination_domain: 'spce.test'
-    destination_user_dialed: '4311003'
+    destination_domain: 'incoming-peer.scenarios.test'
+    destination_user_dialed: '[% incoming_peer_scenarios_test.testuser1003.phone_number %]'
     call_type: 'call'
     call_status: 'ok'
-    call_code: '200'
\ No newline at end of file
+    call_code: '200'
diff --git a/scenarios/incoming_peer/peer.yml b/scenarios/incoming_peer/peer.yml
index 50f5f6c7..95837d76 100644
--- a/scenarios/incoming_peer/peer.yml
+++ b/scenarios/incoming_peer/peer.yml
@@ -1,31 +1,31 @@
 ---
-peer_00:
+peer_incoming_peer:
   contact:
-    company: peer_00
-    email: peer_00@host0.not
+    company: peer_incoming_peer
+    email: peer_incoming_peer@host0.not
   contract:
     billing_profile_id: 1
     status: active
     type: sippeering
   groups:
-    - name: peer_00_group
+    - name: peer_incoming_peer_group
       priority: 1
       description:
   rules:
-    - group_id: peer_00_group
+    - group_id: peer_incoming_peer_group
       callee_prefix: ""
       callee_pattern: ''
-      caller_pattern: '^sip:.+@spce.test'
+      caller_pattern: '^sip:.+@incoming-peer.scenarios.test'
       description: ""
   inboundrules:
-    - group_id: peer_00_group
+    - group_id: peer_incoming_peer_group
       field: "ruri_uri"
       pattern: '.*'
       priority: 50
       enabled: 1
   hosts:
-    - group_id: peer_00_group
-      name: peer_00_host0
+    - group_id: peer_incoming_peer_group
+      name: peer_incoming_peer_host0
       ip: 127.0.2.1
       port: 51602
       host:
diff --git a/scenarios/incoming_peer/prefs.json b/scenarios/incoming_peer/prefs.json.tt2
similarity index 52%
rename from scenarios/incoming_peer/prefs.json
rename to scenarios/incoming_peer/prefs.json.tt2
index 58930cab..3c40c914 100644
--- a/scenarios/incoming_peer/prefs.json
+++ b/scenarios/incoming_peer/prefs.json.tt2
@@ -1,5 +1,5 @@
 {
-    "peer_00_host0": {
+    "peer_incoming_peer_host0": {
         "concurrent_max": 1
     }
 }
diff --git a/scenarios/incoming_peer/scenario.yml b/scenarios/incoming_peer/scenario.yml
index 28bc5272..c177ff18 100644
--- a/scenarios/incoming_peer/scenario.yml
+++ b/scenarios/incoming_peer/scenario.yml
@@ -1,6 +1,7 @@
+---
 test_uuid: incoming_peer
 domains:
-  'spce.test':
+  incoming-peer.scenarios.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.test:
     testuser1003:
       customer: 'customer.test'
       password: testuser
@@ -23,9 +24,10 @@ subscribers:
 scenarios:
   - ip: 127.0.2.1
     username: 004321001
-    domain: 127.0.2.1
+    domain: incoming-peer.host0.peer.scenarios.test
+    peer_host: peer_incoming_peer_host0
     responders:
       - ip: 127.1.0.1
         username: testuser1003
-        domain: spce.test
-        register: yes
+        domain: incoming-peer.scenarios.test
+        register: 'yes'