diff --git a/scenarios/invite_pai_none/0003_test.yml.tt2 b/scenarios/invite_pai_none/0003_test.yml.tt2
index 2ed92a4e..3f696341 100644
--- a/scenarios/invite_pai_none/0003_test.yml.tt2
+++ b/scenarios/invite_pai_none/0003_test.yml.tt2
@@ -22,8 +22,8 @@ flow:
   - exit|ROUTE_EXIT:
 sip_in:
   - '^INVITE'
-  - 'Contact: sip:testuser1002@'
-  - 'To: <sip:testuser1003@'
+  - 'Contact: sip:[% scenarios.0.username %]@'
+  - 'To: <sip:[% scenarios.0.responders.0.username %]@'
   - 'CSeq: 1 INVITE'
   - 'Max-Forwards: 69'
   - 'Content-Type: application/sdp'
@@ -31,12 +31,12 @@ sip_out:
   - [
       '^SIP/2.0 100 Trying',
       'CSeq: 1 INVITE',
-      'From: <sip:testuser1002@',
-      'To: <sip:testuser1003@'
+      'From: <sip:[% scenarios.0.username %]@',
+      'To: <sip:[% scenarios.0.responders.0.username %]@'
     ]
   - [
       '^SIP/2.0 407 Proxy Authentication Required',
       'CSeq: 1 INVITE',
-      'From: <sip:testuser1002@',
-      'To: <sip:testuser1003@'
+      'From: <sip:[% scenarios.0.username %]@',
+      'To: <sip:[% scenarios.0.responders.0.username %]@'
     ]
diff --git a/scenarios/invite_pai_none/0005_test.yml.tt2 b/scenarios/invite_pai_none/0005_test.yml.tt2
index 4a7754b9..bd3f7fff 100644
--- a/scenarios/invite_pai_none/0005_test.yml.tt2
+++ b/scenarios/invite_pai_none/0005_test.yml.tt2
@@ -17,12 +17,12 @@ flow:
   - start|ROUTE_FIND_CALLER:
   - start|ROUTE_AUTH:
   - start|ROUTE_AUTH_HELPER:
-      $x_hdr(From): spce.test
-      $var(realm_user): testuser1002
-      $var(realm_domain): spce.test
+      $x_hdr(From): invite-pai-none.scenarios.test
+      $var(realm_user): [% scenarios.0.username %]
+      $var(realm_domain): invite-pai-none.scenarios.test
   - return|ROUTE_AUTH_HELPER:
-      $avp(orig_acc_caller_user): ['testuser1002']
-      $avp(orig_acc_caller_domain): ['spce.test']
+      $avp(orig_acc_caller_user): ['[% scenarios.0.username %]']
+      $avp(orig_acc_caller_domain): ['invite-pai-none.scenarios.test']
   - start|ROUTE_ADD_CALLINFO_REPLY:
   - start|ROUTE_ADD_CALLINFO_CALLER_PRIMARY:
   - return|ROUTE_ADD_CALLINFO_CALLER_PRIMARY:
@@ -65,10 +65,10 @@ flow:
   - return|ROUTE_SET_CALLEE_DIALOG:
       $avp(lua_dlg_profile): [
         "totalaccount:[% customer_test.id %]",
-        "totaluser:[% spce_test.testuser1003.uuid %]",
+        "totaluser:[% invite_pai_none_scenarios_test.testuser1003.uuid %]",
         "total",
         "account:[% customer_test.id %]",
-        "user:[% spce_test.testuser1003.uuid %]"
+        "user:[% invite_pai_none_scenarios_test.testuser1003.uuid %]"
       ]
   - start|ROUTE_BLOCK_IN:
   - return|ROUTE_BLOCK_IN:
@@ -102,29 +102,29 @@ flow:
       $avp(lua_dlg_profile): [
         "local",
         "totalaccount:[% customer_test.id %]",
-        "totaluser:[% spce_test.testuser1003.uuid %]",
+        "totaluser:[% invite_pai_none_scenarios_test.testuser1003.uuid %]",
         "total",
         "account:[% customer_test.id %]",
-        "user:[% spce_test.testuser1003.uuid %]"
+        "user:[% invite_pai_none_scenarios_test.testuser1003.uuid %]"
       ]
   - start|ROUTE_CNT_DLG_CHECK:
   - return|ROUTE_CNT_DLG_CHECK:
   - return|ROUTE_SET_CALLER_DIALOG:
       $avp(lua_dlg_profile): [
         "accountout:[% customer_test.id %]",
-        "userout:[% spce_test.testuser1002.uuid %]",
+        "userout:[% invite_pai_none_scenarios_test.testuser1002.uuid %]",
         "account:[% customer_test.id %]",
-        "user:[% spce_test.testuser1002.uuid %]",
+        "user:[% invite_pai_none_scenarios_test.testuser1002.uuid %]",
         "totalaccountout:[% customer_test.id %]",
-        "totaluserout:[% spce_test.testuser1002.uuid %]",
+        "totaluserout:[% invite_pai_none_scenarios_test.testuser1002.uuid %]",
         "totalaccount:[% customer_test.id %]",
-        "totaluser:[% spce_test.testuser1002.uuid %]",
+        "totaluser:[% invite_pai_none_scenarios_test.testuser1002.uuid %]",
         "local",
         "totalaccount:[% customer_test.id %]",
-        "totaluser:[% spce_test.testuser1003.uuid %]",
+        "totaluser:[% invite_pai_none_scenarios_test.testuser1003.uuid %]",
         "total",
         "account:[% customer_test.id %]",
-        "user:[% spce_test.testuser1003.uuid %]"
+        "user:[% invite_pai_none_scenarios_test.testuser1003.uuid %]"
       ]
   - start|ROUTE_ACC_CALLER:
   - start|ROUTE_SET_ACC_CALLER_CALL_COUNTERS:
@@ -191,50 +191,50 @@ flow:
   - exit|ROUTE_EXIT:
       $avp(lua_dlg_profile): [
         "accountout:[% customer_test.id %]",
-        "userout:[% spce_test.testuser1002.uuid %]",
+        "userout:[% invite_pai_none_scenarios_test.testuser1002.uuid %]",
         "account:[% customer_test.id %]",
-        "user:[% spce_test.testuser1002.uuid %]",
+        "user:[% invite_pai_none_scenarios_test.testuser1002.uuid %]",
         "totalaccountout:[% customer_test.id %]",
-        "totaluserout:[% spce_test.testuser1002.uuid %]",
+        "totaluserout:[% invite_pai_none_scenarios_test.testuser1002.uuid %]",
         "totalaccount:[% customer_test.id %]",
-        "totaluser:[% spce_test.testuser1002.uuid %]",
+        "totaluser:[% invite_pai_none_scenarios_test.testuser1002.uuid %]",
         "local",
         "totalaccount:[% customer_test.id %]",
-        "totaluser:[% spce_test.testuser1003.uuid %]",
+        "totaluser:[% invite_pai_none_scenarios_test.testuser1003.uuid %]",
         "total",
         "account:[% customer_test.id %]",
-        "user:[% spce_test.testuser1003.uuid %]"
+        "user:[% invite_pai_none_scenarios_test.testuser1003.uuid %]"
       ]
 sip_in:
   - '^INVITE'
-  - 'Contact: sip:testuser1002@'
+  - 'Contact: sip:[% scenarios.0.username %]@'
   - 'CSeq: 2 INVITE'
   - 'Max-Forwards: 69'
   - 'Content-Type: application/sdp'
-  - 'Proxy-Authorization: Digest username="testuser1002"'
+  - 'Proxy-Authorization: Digest username="[% scenarios.0.username %]"'
 sip_out:
   - [
       '^SIP/2.0 100 Trying',
       'CSeq: 2 INVITE',
-      'From: <sip:testuser1002@',
-      'To: <sip:testuser1003@'
+      'From: <sip:[% scenarios.0.username %]@',
+      'To: <sip:[% scenarios.0.responders.0.username %]@'
     ]
   - [
       '^SIP/2.0 101 Connecting',
       'CSeq: 2 INVITE',
-      'From: <sip:testuser1002@',
-      'To: <sip:testuser1003@'
+      'From: <sip:[% scenarios.0.username %]@',
+      'To: <sip:[% scenarios.0.responders.0.username %]@'
     ]
   - [
-      '^INVITE sip:testuser1003@',
+      '^INVITE sip:[% scenarios.0.responders.0.username %]@',
       'CSeq: 2 INVITE',
-      'From: <sip:4311002@',
-      'To: <sip:testuser1003@',
+      'From: <sip:[% invite_pai_none_scenarios_test.testuser1002.phone_number %]@',
+      'To: <sip:[% scenarios.0.responders.0.username %]@',
       'Content-Type: application/sdp',
-      'P-Caller-UUID: [% spce_test.testuser1002.uuid %]',
-      'P-Callee-UUID: [% spce_test.testuser1003.uuid %]',
+      'P-Caller-UUID: [% invite_pai_none_scenarios_test.testuser1002.uuid %]',
+      'P-Callee-UUID: [% invite_pai_none_scenarios_test.testuser1003.uuid %]',
       '_:NOT:_P-Asserted-Identity:',
-      'P-Called-Party-ID: <sip:testuser1003@',
+      'P-Called-Party-ID: <sip:[% scenarios.0.responders.0.username %]@',
       'P-App-Param: ;calltimer=21600;aleg_sst_enable=no;sst_enable=no',
       'P-App-Name: sbc'
     ]
diff --git a/scenarios/invite_pai_none/0007_test.yml.tt2 b/scenarios/invite_pai_none/0007_test.yml.tt2
index 26e2e539..c5ac78ea 100644
--- a/scenarios/invite_pai_none/0007_test.yml.tt2
+++ b/scenarios/invite_pai_none/0007_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:4311002@spce.test>;tag=[\w-]+'
-  - 'To: <sip:testuser1003@spce.test>'
+  - 'INVITE sip:[% scenarios.0.responders.0.username %]@[% scenarios.0.responders.0.ip %]:[% scenarios.0.responders.0.port %] SIP/2.0'
+  - 'From: <sip:[% invite_pai_none_scenarios_test.testuser1002.phone_number %]@invite-pai-none.scenarios.test>;tag=[\w-]+'
+  - 'To: <sip:[% scenarios.0.responders.0.username %]@invite-pai-none.scenarios.test>'
   - 'CSeq: \d+ INVITE'
   - 'P-LB-Uptime: \d+'
   - '_:NOT:_P-Asserted-Identity:'
-  - 'P-Caller-UUID: [% spce_test.testuser1002.uuid %]'
-  - 'P-NGCP-Caller-Info: <sip:testuser1002@spce.test>;ip=127.126.0.1;port=\d+;primary=4311002'
-  - 'P-NGCP-Callee-Info: <sip:testuser1003@spce.test>;ip=127.0.0.1;port=5060;primary=4311003'
+  - 'P-Caller-UUID: [% invite_pai_none_scenarios_test.testuser1002.uuid %]'
+  - 'P-NGCP-Caller-Info: <sip:[% scenarios.0.username %]@invite-pai-none.scenarios.test>;ip=[% scenarios.0.ip %];port=[% scenarios.0.port %];primary=[% invite_pai_none_scenarios_test.testuser1002.phone_number %]'
+  - 'P-NGCP-Callee-Info: <sip:[% scenarios.0.responders.0.username %]@invite-pai-none.scenarios.test>;ip=127.0.0.1;port=5060;primary=[% invite_pai_none_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:4311002@spce.test>;tag=[\w-]+',
-      'To: <sip:testuser1003@spce.test>',
+      'From: <sip:[% invite_pai_none_scenarios_test.testuser1002.phone_number %]@invite-pai-none.scenarios.test>;tag=[\w-]+',
+      'To: <sip:[% scenarios.0.responders.0.username %]@invite-pai-none.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:4311002@spce.test>;tag=[\w-]+',
-      'To: <sip:testuser1003@spce.test>',
+      'INVITE sip:[% scenarios.0.responders.0.username %]@[% scenarios.0.responders.0.ip %]:[% scenarios.0.responders.0.port %] SIP/2.0',
+      'From: <sip:[% invite_pai_none_scenarios_test.testuser1002.phone_number %]@invite-pai-none.scenarios.test>;tag=[\w-]+',
+      'To: <sip:[% scenarios.0.responders.0.username %]@invite-pai-none.scenarios.test>',
       'CSeq: \d+ INVITE',
       'P-LB-Uptime: \d+',
       '_:NOT:_P-Asserted-Identity:',
-      'P-Caller-UUID: [% spce_test.testuser1002.uuid %]',
-      'P-NGCP-Caller-Info: <sip:testuser1002@spce.test>;ip=127.126.0.1;port=\d+;primary=4311002',
-      'P-NGCP-Callee-Info: <sip:testuser1003@spce.test>;ip=127.0.0.1;port=5060;primary=4311003',
+      'P-Caller-UUID: [% invite_pai_none_scenarios_test.testuser1002.uuid %]',
+      'P-NGCP-Caller-Info: <sip:[% scenarios.0.username %]@invite-pai-none.scenarios.test>;ip=[% scenarios.0.ip %];port=[% scenarios.0.port %];primary=[% invite_pai_none_scenarios_test.testuser1002.phone_number %]',
+      'P-NGCP-Callee-Info: <sip:[% scenarios.0.responders.0.username %]@invite-pai-none.scenarios.test>;ip=127.0.0.1;port=5060;primary=[% invite_pai_none_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/invite_pai_none/0012_test.yml.tt2 b/scenarios/invite_pai_none/0012_test.yml.tt2
index 3a888e5e..b039cf45 100644
--- a/scenarios/invite_pai_none/0012_test.yml.tt2
+++ b/scenarios/invite_pai_none/0012_test.yml.tt2
@@ -17,19 +17,19 @@ flow:
   - return|dialog:start:
       $avp(lua_dlg_profile): [
         "accountout:[% customer_test.id %]",
-        "userout:[% spce_test.testuser1002.uuid %]",
+        "userout:[% invite_pai_none_scenarios_test.testuser1002.uuid %]",
         "account:[% customer_test.id %]",
-        "user:[% spce_test.testuser1002.uuid %]",
+        "user:[% invite_pai_none_scenarios_test.testuser1002.uuid %]",
         "totalaccountout:[% customer_test.id %]",
-        "totaluserout:[% spce_test.testuser1002.uuid %]",
+        "totaluserout:[% invite_pai_none_scenarios_test.testuser1002.uuid %]",
         "totalaccount:[% customer_test.id %]",
-        "totaluser:[% spce_test.testuser1002.uuid %]",
+        "totaluser:[% invite_pai_none_scenarios_test.testuser1002.uuid %]",
         "local",
         "totalaccount:[% customer_test.id %]",
-        "totaluser:[% spce_test.testuser1003.uuid %]",
+        "totaluser:[% invite_pai_none_scenarios_test.testuser1003.uuid %]",
         "total",
         "account:[% customer_test.id %]",
-        "user:[% spce_test.testuser1003.uuid %]"
+        "user:[% invite_pai_none_scenarios_test.testuser1003.uuid %]"
       ]
   - return|dialog:start:
 sip_in:
@@ -39,6 +39,6 @@ sip_out:
   - [
       '^SIP/2.0 200 OK',
       'CSeq: 2 INVITE',
-      'From: <sip:testuser1002@',
-      'To: <sip:testuser1003@'
+      'From: <sip:[% scenarios.0.username %]@',
+      'To: <sip:[% scenarios.0.responders.0.username %]@'
     ]
diff --git a/scenarios/invite_pai_none/0013_test.yml.tt2 b/scenarios/invite_pai_none/0013_test.yml.tt2
index c3889190..93f48bd9 100644
--- a/scenarios/invite_pai_none/0013_test.yml.tt2
+++ b/scenarios/invite_pai_none/0013_test.yml.tt2
@@ -26,12 +26,12 @@ flow:
 sip_in:
   - '^ACK sip:127.0.0.1:5080;prxroute=1 SIP/2.0'
   - 'CSeq: 2 ACK'
-  - 'From: <sip:testuser1002@'
-  - 'To: <sip:testuser1003@'
+  - 'From: <sip:[% scenarios.0.username %]@'
+  - 'To: <sip:[% scenarios.0.responders.0.username %]@'
 sip_out:
   - [
       '^ACK sip:127.0.0.1:5080;prxroute=1 SIP/2.0',
       'CSeq: 2 ACK',
-      'From: <sip:4311002@',
-      'To: <sip:testuser1003@'
+      'From: <sip:[% invite_pai_none_scenarios_test.testuser1002.phone_number %]@',
+      'To: <sip:[% scenarios.0.responders.0.username %]@'
     ]
diff --git a/scenarios/invite_pai_none/0015_test.yml.tt2 b/scenarios/invite_pai_none/0015_test.yml.tt2
index 54eac48e..0f9ee942 100644
--- a/scenarios/invite_pai_none/0015_test.yml.tt2
+++ b/scenarios/invite_pai_none/0015_test.yml.tt2
@@ -29,27 +29,27 @@ flow:
   - exit|ROUTE_EXIT:
 sip_in:
   - '^BYE sip:127.0.0.1:5080(;prxroute=1)? SIP/2.0'
-  - 'Contact: sip:testuser1002@'
+  - 'Contact: sip:[% scenarios.0.username %]@'
   - 'CSeq: 3 BYE'
   - 'Max-Forwards: 69'
   - 'Content-Length: 0'
-  - 'From: <sip:testuser1002@'
-  - 'To: <sip:testuser1003@'
+  - 'From: <sip:[% scenarios.0.username %]@'
+  - 'To: <sip:[% scenarios.0.responders.0.username %]@'
 
 sip_out:
   - [
       '^SIP/2.0 100 Trying',
       'CSeq: 3 BYE',
       'Content-Length: 0',
-      'From: <sip:testuser1002@',
-      'To: <sip:testuser1003@'
+      'From: <sip:[% scenarios.0.username %]@',
+      'To: <sip:[% scenarios.0.responders.0.username %]@'
     ]
   - [
       '^BYE sip:127.0.0.1:5080(;prxroute=1)? SIP/2.0',
-      'Contact: sip:testuser1002@',
+      'Contact: sip:[% scenarios.0.username %]@',
       'CSeq: 3 BYE',
       'Max-Forwards: 68',
       'Content-Length: 0',
-      'From: <sip:4311002@',
-      'To: <sip:testuser1003@'
+      'From: <sip:[% invite_pai_none_scenarios_test.testuser1002.phone_number %]@',
+      'To: <sip:[% scenarios.0.responders.0.username %]@'
     ]
diff --git a/scenarios/invite_pai_none/0018_test.yml.tt2 b/scenarios/invite_pai_none/0018_test.yml.tt2
index 550fc7b1..c7331862 100644
--- a/scenarios/invite_pai_none/0018_test.yml.tt2
+++ b/scenarios/invite_pai_none/0018_test.yml.tt2
@@ -16,13 +16,13 @@ sip_in:
   - '^SIP/2.0 200 OK'
   - 'CSeq: 3 BYE'
   - 'Content-Length: 0'
-  - 'From: <sip:4311002@'
-  - 'To: <sip:testuser1003@'
+  - 'From: <sip:[% invite_pai_none_scenarios_test.testuser1002.phone_number %]@'
+  - 'To: <sip:[% scenarios.0.responders.0.username %]@'
 sip_out:
   - [
       '^SIP/2.0 200 OK',
       'CSeq: 3 BYE',
       'Content-Length: 0',
-      'From: <sip:testuser1002@',
-      'To: <sip:testuser1003@'
+      'From: <sip:[% scenarios.0.username %]@',
+      'To: <sip:[% scenarios.0.responders.0.username %]@'
     ]
diff --git a/scenarios/invite_pai_none/cdr_test.yml.tt2 b/scenarios/invite_pai_none/cdr_test.yml.tt2
index 7e903ea7..9934a593 100644
--- a/scenarios/invite_pai_none/cdr_test.yml.tt2
+++ b/scenarios/invite_pai_none/cdr_test.yml.tt2
@@ -1,10 +1,10 @@
 cdr:
-  - source_user: 'testuser1002'
-    source_domain: 'spce.test'
-    source_cli: '4311002'
-    destination_user: 'testuser1003'
-    destination_domain: 'spce.test'
-    destination_user_dialed: 'testuser1003'
+  - source_user: '[% scenarios.0.username %]'
+    source_domain: 'invite-pai-none.scenarios.test'
+    source_cli: '[% invite_pai_none_scenarios_test.testuser1002.phone_number %]'
+    destination_user: '[% scenarios.0.responders.0.username %]'
+    destination_domain: 'invite-pai-none.scenarios.test'
+    destination_user_dialed: '[% scenarios.0.responders.0.username %]'
     call_type: 'call'
     call_status: 'ok'
     call_code: '200'
\ No newline at end of file
diff --git a/scenarios/invite_pai_none/prefs.json b/scenarios/invite_pai_none/prefs.json
deleted file mode 100644
index fc1a7a54..00000000
--- a/scenarios/invite_pai_none/prefs.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-    "testuser1003@spce.test": {
-        "outbound_pai_user": "none"
-    }
-}
diff --git a/scenarios/invite_pai_none/prefs.json.tt2 b/scenarios/invite_pai_none/prefs.json.tt2
new file mode 100644
index 00000000..27d230ee
--- /dev/null
+++ b/scenarios/invite_pai_none/prefs.json.tt2
@@ -0,0 +1,5 @@
+{
+    "[% scenarios.0.responders.0.username %]@invite-pai-none.scenarios.test": {
+        "outbound_pai_user": "none"
+    }
+}
diff --git a/scenarios/invite_pai_none/scenario.yml b/scenarios/invite_pai_none/scenario.yml
index 586fd743..eaf2b81f 100644
--- a/scenarios/invite_pai_none/scenario.yml
+++ b/scenarios/invite_pai_none/scenario.yml
@@ -1,6 +1,7 @@
+---
 test_uuid: invite_pai_none
 domains:
-  'spce.test':
+  invite-pai-none.scenarios.test:
     reseller_id: 1
 customers:
   'customer.test':
@@ -13,7 +14,7 @@ customers:
       billing_profile_id: 1
       reseller_id: 1
 subscribers:
-  spce.test:
+  invite-pai-none.scenarios.test:
     testuser1003:
       customer: 'customer.test'
       password: testuser
@@ -33,9 +34,9 @@ subscribers:
 scenarios:
   - ip: 127.126.0.1
     username: testuser1002
-    domain: spce.test
+    domain: invite-pai-none.scenarios.test
     responders:
       - ip: 127.1.0.1
         username: testuser1003
-        domain: spce.test
-        register: yes
+        domain: invite-pai-none.scenarios.test
+        register: 'yes'