diff --git a/scenarios_pbx/invite/0005_test.yml.tt2 b/scenarios_pbx/invite/0005_test.yml.tt2
index 2d3a0dff..3f67ad8a 100644
--- a/scenarios_pbx/invite/0005_test.yml.tt2
+++ b/scenarios_pbx/invite/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
+      $x_hdr(From): invite.scenarios-pbx.test
       $var(realm_user): testuser1002
-      $var(realm_domain): spce.test
+      $var(realm_domain): invite.scenarios-pbx.test
   - return|ROUTE_AUTH_HELPER:
       $avp(orig_acc_caller_user): ['testuser1002']
-      $avp(orig_acc_caller_domain): ['spce.test']
+      $avp(orig_acc_caller_domain): ['invite.scenarios-pbx.test']
   - start|ROUTE_ADD_CALLINFO_REPLY:
   - start|ROUTE_ADD_CALLINFO_CALLER_PRIMARY:
   - return|ROUTE_ADD_CALLINFO_CALLER_PRIMARY:
@@ -67,7 +67,7 @@ flow:
   - return|ROUTE_SET_CALLEE_DIALOG:
       $avp(lua_dlg_profile): [
         "totalaccount:[% customerpbx_test.id %]",
-        "totaluser:[% spce_test.testuser1003.uuid %]",
+        "totaluser:[% invite_scenarios_pbx_test.testuser1003.uuid %]",
         "total"
       ]
   - start|ROUTE_BLOCK_IN:
@@ -95,11 +95,11 @@ flow:
   - return|ROUTE_SET_CALLER_DIALOG:
       $avp(lua_dlg_profile): [
         "totalaccountout:[% customerpbx_test.id %]",
-        "totaluserout:[% spce_test.testuser1002.uuid %]",
+        "totaluserout:[% invite_scenarios_pbx_test.testuser1002.uuid %]",
         "totalaccount:[% customerpbx_test.id %]",
-        "totaluser:[% spce_test.testuser1002.uuid %]",
+        "totaluser:[% invite_scenarios_pbx_test.testuser1002.uuid %]",
         "totalaccount:[% customerpbx_test.id %]",
-        "totaluser:[% spce_test.testuser1003.uuid %]",
+        "totaluser:[% invite_scenarios_pbx_test.testuser1003.uuid %]",
         "total"
       ]
   - start|ROUTE_ACC_CALLER:
@@ -138,11 +138,11 @@ flow:
   - start|ROUTE_EXIT:
       $avp(lua_dlg_profile): [
         "totalaccountout:[% customerpbx_test.id %]",
-        "totaluserout:[% spce_test.testuser1002.uuid %]",
+        "totaluserout:[% invite_scenarios_pbx_test.testuser1002.uuid %]",
         "totalaccount:[% customerpbx_test.id %]",
-        "totaluser:[% spce_test.testuser1002.uuid %]",
+        "totaluser:[% invite_scenarios_pbx_test.testuser1002.uuid %]",
         "totalaccount:[% customerpbx_test.id %]",
-        "totaluser:[% spce_test.testuser1003.uuid %]",
+        "totaluser:[% invite_scenarios_pbx_test.testuser1003.uuid %]",
         "total"
       ]
   - start|ROUTE_RUNTIME:
@@ -167,13 +167,13 @@ sip_out:
       'CSeq: 2 INVITE',
       'From: <sip:testuser1002@',
       'To: <sip:1003@',
-      'P-Caller-UUID: [% spce_test.testuser1002.uuid %]',
+      'P-Caller-UUID: [% invite_scenarios_pbx_test.testuser1002.uuid %]',
       'P-NGCP-Caller-Info: <sip:testuser1002@'
     ]
   - [
-      '^PUBLISH sip:testuser1002@spce.test SIP/2.0',
-      'From: <sip:testuser1002@spce.test>',
-      'To: <sip:testuser1002@spce.test>',
+      '^PUBLISH sip:testuser1002@invite.scenarios-pbx.test SIP/2.0',
+      'From: <sip:testuser1002@invite.scenarios-pbx.test>',
+      'To: <sip:testuser1002@invite.scenarios-pbx.test>',
       'Event: dialog',
       'Content-Type: application/dialog-info\+xml',
     ]
@@ -183,10 +183,10 @@ sip_out:
       'From: <sip:testuser1002@',
       'To: <sip:1003@',
       'Content-Type: application/sdp',
-      'P-Caller-UUID: [% spce_test.testuser1002.uuid %]',
-      'P-Callee-UUID: [% spce_test.testuser1003.uuid %]',
+      'P-Caller-UUID: [% invite_scenarios_pbx_test.testuser1002.uuid %]',
+      'P-Callee-UUID: [% invite_scenarios_pbx_test.testuser1003.uuid %]',
       'P-NGCP-Lookup-Type: ext',
-      'P-NGCP-Orig-User: 43110021003',
+      'P-NGCP-Orig-User: [% invite_scenarios_pbx_test.testuser1003.pbx_phone_number %]',
       'P-NGCP-Orig-Dialed: 1003',
       'P-App-Param: (;calltimer=21600)?;profile=ngcp_pbx;a_park_domain=\d+;b_park_domain=\d+',
       'P-App-Name: sbc'
diff --git a/scenarios_pbx/invite/0007_test.yml.tt2 b/scenarios_pbx/invite/0007_test.yml.tt2
index c3a25853..1ff9370b 100644
--- a/scenarios_pbx/invite/0007_test.yml.tt2
+++ b/scenarios_pbx/invite/0007_test.yml.tt2
@@ -149,8 +149,8 @@ sip_in:
   - 'CSeq: \d+ INVITE'
   - 'Max-Forwards: 70'
   - 'P-NGCP-Lookup-Type: ext'
-  - 'P-NGCP-Orig-User: 43110021003'
-  - 'P-NGCP-Orig-Domain: spce.test'
+  - 'P-NGCP-Orig-User: [% invite_scenarios_pbx_test.testuser1003.pbx_phone_number %]'
+  - 'P-NGCP-Orig-Domain: invite.scenarios-pbx.test'
   - 'P-NGCP-Orig-Dialed: 1003'
   - 'P-NGCP-BlockOut-Override: 0'
   - 'P-NGCP-AdmBlockOut-Override: 0'
@@ -160,7 +160,7 @@ sip_in:
   - 'P-Caller-UUID: [% spce_test.testuser1002.uuid %]'
   - 'P-Callee-UUID: [% spce_test.testuser1003.uuid %]'
   - 'P-NGCP-Caller-Info: <sip:testuser1002@'
-  - 'P-NGCP-Callee-Info: <sip:43110021003@spce.test>;ip=127.0.0.1;port=5080;'
+  - 'P-NGCP-Callee-Info: <sip:[% invite_scenarios_pbx_test.testuser1003.pbx_phone_number %]@invite.scenarios-pbx.test>;ip=127.0.0.1;port=5080;'
   - 'P-To-Device: 1'
   - 'Content-Type: application/sdp'
   - 'Contact: <sip:127.0.0.1:5080;transport=udp>'
@@ -175,7 +175,7 @@ sip_out:
    ]
   - [
        'INVITE sip:testuser1003@',
-       'From: <sip:4311002@',
+       'From: <sip:[% invite_scenarios_pbx_test.testuser1002.phone_number %]@',
        'To: <sip:1003@',
        'CSeq: \d+ INVITE',
        'Max-Forwards: 69',
@@ -183,11 +183,11 @@ sip_out:
        'Contact: <sip:127.0.0.1:5080;transport=udp>',
        'P-Caller-UUID: [% spce_test.testuser1002.uuid %]',
        'P-Callee-UUID: [% spce_test.testuser1003.uuid %]',
-       'P-Asserted-Identity: <sip:4311002@',
+       'P-Asserted-Identity: <sip:[% invite_scenarios_pbx_test.testuser1002.phone_number %]@',
        'P-Called-Party-ID: <sip:testuser1003@',
        'P-App-Param: ;calltimer=21600;aleg_sst_enable=no;sst_enable=no',
        'P-App-Name: sbc',
        'P-NGCP-Caller-Info: <sip:testuser1002@',
-       'P-NGCP-Callee-Info: <sip:43110021003@',
+       'P-NGCP-Callee-Info: <sip:[% invite_scenarios_pbx_test.testuser1003.pbx_phone_number %]@',
        'P-D-Uri: sip:lb@127.0.0.1;lr;socket=sip:127.0.0.1:5060'
     ]
diff --git a/scenarios_pbx/invite/0012_test.yml.tt2 b/scenarios_pbx/invite/0012_test.yml.tt2
index 5ca76cd9..f7038c17 100644
--- a/scenarios_pbx/invite/0012_test.yml.tt2
+++ b/scenarios_pbx/invite/0012_test.yml.tt2
@@ -21,9 +21,9 @@ sip_in:
   - 'CSeq: \d+ INVITE'
 sip_out:
   - [
-      '^PUBLISH sip:testuser1003@spce.test SIP/2.0',
-      'From: <sip:testuser1003@spce.test>',
-      'To: <sip:testuser1003@spce.test>',
+      '^PUBLISH sip:testuser1003@invite.scenarios-pbx.test SIP/2.0',
+      'From: <sip:testuser1003@invite.scenarios-pbx.test>',
+      'To: <sip:testuser1003@invite.scenarios-pbx.test>',
       'Event: dialog',
       'Content-Type: application/dialog-info\+xml',
     ]
diff --git a/scenarios_pbx/invite/0013_test.yml.tt2 b/scenarios_pbx/invite/0013_test.yml.tt2
index c965e6eb..8959f1d9 100644
--- a/scenarios_pbx/invite/0013_test.yml.tt2
+++ b/scenarios_pbx/invite/0013_test.yml.tt2
@@ -3,11 +3,11 @@ flow:
   - start|REPLY_ROUTE_NAT:
       $avp(lua_dlg_profile): [
         "totalaccountout:[% customerpbx_test.id %]",
-        "totaluserout:[% spce_test.testuser1002.uuid %]",
+        "totaluserout:[% invite_scenarios_pbx_test.testuser1002.uuid %]",
         "totalaccount:[% customerpbx_test.id %]",
-        "totaluser:[% spce_test.testuser1002.uuid %]",
+        "totaluser:[% invite_scenarios_pbx_test.testuser1002.uuid %]",
         "totalaccount:[% customerpbx_test.id %]",
-        "totaluser:[% spce_test.testuser1003.uuid %]",
+        "totaluser:[% invite_scenarios_pbx_test.testuser1003.uuid %]",
         "total"
       ]
   - start|ROUTE_ENTRY:
@@ -28,9 +28,9 @@ sip_in:
   - 'CSeq: 2 INVITE'
 sip_out:
   - [
-      '^PUBLISH sip:testuser1002@spce.test SIP/2.0',
-      'From: <sip:testuser1002@spce.test>',
-      'To: <sip:testuser1002@spce.test>',
+      '^PUBLISH sip:testuser1002@invite.scenarios-pbx.test SIP/2.0',
+      'From: <sip:testuser1002@invite.scenarios-pbx.test>',
+      'To: <sip:testuser1002@invite.scenarios-pbx.test>',
       'Event: dialog',
       'Content-Type: application/dialog-info\+xml',
     ]
diff --git a/scenarios_pbx/invite/0015_test.yml.tt2 b/scenarios_pbx/invite/0015_test.yml.tt2
index 72e7d9bf..674b3686 100644
--- a/scenarios_pbx/invite/0015_test.yml.tt2
+++ b/scenarios_pbx/invite/0015_test.yml.tt2
@@ -25,9 +25,9 @@ sip_in:
   - 'CSeq: \d+ INVITE'
 sip_out:
   - [
-      '^PUBLISH sip:testuser1003@spce.test SIP/2.0',
-      'From: <sip:testuser1003@spce.test>',
-      'To: <sip:testuser1003@spce.test>',
+      '^PUBLISH sip:testuser1003@invite.scenarios-pbx.test SIP/2.0',
+      'From: <sip:testuser1003@invite.scenarios-pbx.test>',
+      'To: <sip:testuser1003@invite.scenarios-pbx.test>',
       'Event: dialog',
       'Content-Type: application/dialog-info\+xml',
     ]
diff --git a/scenarios_pbx/invite/0016_test.yml.tt2 b/scenarios_pbx/invite/0016_test.yml.tt2
index 16eae5cc..ed9d1793 100644
--- a/scenarios_pbx/invite/0016_test.yml.tt2
+++ b/scenarios_pbx/invite/0016_test.yml.tt2
@@ -21,11 +21,11 @@ flow:
   - return|dialog:start:
       $avp(lua_dlg_profile): [
         "totalaccountout:[% customerpbx_test.id %]",
-        "totaluserout:[% spce_test.testuser1002.uuid %]",
+        "totaluserout:[% invite_scenarios_pbx_test.testuser1002.uuid %]",
         "totalaccount:[% customerpbx_test.id %]",
-        "totaluser:[% spce_test.testuser1002.uuid %]",
+        "totaluser:[% invite_scenarios_pbx_test.testuser1002.uuid %]",
         "totalaccount:[% customerpbx_test.id %]",
-        "totaluser:[% spce_test.testuser1003.uuid %]",
+        "totaluser:[% invite_scenarios_pbx_test.testuser1003.uuid %]",
         "total"
       ]
   - return|dialog:start:
@@ -34,9 +34,9 @@ sip_in:
   - 'CSeq: 2 INVITE'
 sip_out:
   - [
-      '^PUBLISH sip:testuser1002@spce.test SIP/2.0',
-      'From: <sip:testuser1002@spce.test>',
-      'To: <sip:testuser1002@spce.test>',
+      '^PUBLISH sip:testuser1002@invite.scenarios-pbx.test SIP/2.0',
+      'From: <sip:testuser1002@invite.scenarios-pbx.test>',
+      'To: <sip:testuser1002@invite.scenarios-pbx.test>',
       'Event: dialog',
       'Content-Type: application/dialog-info\+xml',
     ]
diff --git a/scenarios_pbx/invite/0018_test.yml.tt2 b/scenarios_pbx/invite/0018_test.yml.tt2
index 72879213..db75b574 100644
--- a/scenarios_pbx/invite/0018_test.yml.tt2
+++ b/scenarios_pbx/invite/0018_test.yml.tt2
@@ -28,6 +28,6 @@ sip_out:
   - [
       '^ACK sip:127.0.0.1:5080;transport=udp SIP/2.0',
       'CSeq: \d+ ACK',
-      'From: <sip:4311002@',
+      'From: <sip:[% invite_scenarios_pbx_test.testuser1002.phone_number %]@',
       'To: <sip:1003@'
     ]
diff --git a/scenarios_pbx/invite/0020_test.yml.tt2 b/scenarios_pbx/invite/0020_test.yml.tt2
index cb9cd8b5..50ae52f0 100644
--- a/scenarios_pbx/invite/0020_test.yml.tt2
+++ b/scenarios_pbx/invite/0020_test.yml.tt2
@@ -49,9 +49,9 @@ sip_out:
       'To: <sip:1003@'
     ]
   - [
-      '^PUBLISH sip:testuser1002@spce.test SIP/2.0',
-      'From: <sip:testuser1002@spce.test>',
-      'To: <sip:testuser1002@spce.test>',
+      '^PUBLISH sip:testuser1002@invite.scenarios-pbx.test SIP/2.0',
+      'From: <sip:testuser1002@invite.scenarios-pbx.test>',
+      'To: <sip:testuser1002@invite.scenarios-pbx.test>',
       'Event: dialog',
       'Content-Type: application/dialog-info\+xml',
     ]
diff --git a/scenarios_pbx/invite/0021_test.yml.tt2 b/scenarios_pbx/invite/0021_test.yml.tt2
index d94f5a5c..27e04b4c 100644
--- a/scenarios_pbx/invite/0021_test.yml.tt2
+++ b/scenarios_pbx/invite/0021_test.yml.tt2
@@ -44,9 +44,9 @@ sip_out:
       'To: <sip:1003@'
     ]
   - [
-      '^PUBLISH sip:testuser1003@spce.test SIP/2.0',
-      'From: <sip:testuser1003@spce.test>',
-      'To: <sip:testuser1003@spce.test>',
+      '^PUBLISH sip:testuser1003@invite.scenarios-pbx.test SIP/2.0',
+      'From: <sip:testuser1003@invite.scenarios-pbx.test>',
+      'To: <sip:testuser1003@invite.scenarios-pbx.test>',
       'Event: dialog',
       'Content-Type: application/dialog-info\+xml',
     ]
@@ -55,6 +55,6 @@ sip_out:
       'CSeq: \d+ BYE',
       'Max-Forwards: 69',
       'Content-Length: 0',
-      'From: <sip:4311002@',
+      'From: <sip:[% invite_scenarios_pbx_test.testuser1002.phone_number %]@',
       'To: <sip:1003@'
     ]
diff --git a/scenarios_pbx/invite/0024_test.yml.tt2 b/scenarios_pbx/invite/0024_test.yml.tt2
index 1d98aa87..0e66fcf8 100644
--- a/scenarios_pbx/invite/0024_test.yml.tt2
+++ b/scenarios_pbx/invite/0024_test.yml.tt2
@@ -16,7 +16,7 @@ sip_in:
   - '^SIP/2.0 200 OK'
   - 'CSeq: \d+ BYE'
   - 'Content-Length: 0'
-  - 'From: <sip:4311002@'
+  - 'From: <sip:[% invite_scenarios_pbx_test.testuser1002.phone_number %]@'
   - 'To: <sip:1003@'
 sip_out:
   - [
diff --git a/scenarios_pbx/invite/cdr_test.yml.tt2 b/scenarios_pbx/invite/cdr_test.yml.tt2
index 724ce02d..37d8afa6 100644
--- a/scenarios_pbx/invite/cdr_test.yml.tt2
+++ b/scenarios_pbx/invite/cdr_test.yml.tt2
@@ -1,11 +1,11 @@
 cdr:
   - source_user: 'testuser1002'
-    source_domain: 'spce.test'
-    source_cli: '4311002'
+    source_domain: 'invite.scenarios-pbx.test'
+    source_cli: '[% invite_scenarios_pbx_test.testuser1002.phone_number %]'
     destination_user: 'testuser1003'
-    destination_domain: 'spce.test'
+    destination_domain: 'invite.scenarios-pbx.test'
     destination_user_dialed: '1003'
-    destination_user_in: '43110021003'
+    destination_user_in: '[% invite_scenarios_pbx_test.testuser1003.pbx_phone_number %]'
     call_type: 'call'
     call_status: 'ok'
     call_code: '200'
\ No newline at end of file
diff --git a/scenarios_pbx/invite/scenario.yml b/scenarios_pbx/invite/scenario.yml
index 0e7b3c18..ac60ec6d 100644
--- a/scenarios_pbx/invite/scenario.yml
+++ b/scenarios_pbx/invite/scenario.yml
@@ -1,6 +1,7 @@
+---
 test_uuid: invite
 domains:
-  'spce.test':
+  invite.scenarios-pbx.test:
     reseller_id: 1
 customers:
   'customerpbx.test':
@@ -13,7 +14,7 @@ customers:
       billing_profile_id: 1
       reseller_id: 1
 subscribers:
-  spce.test:
+  invite.scenarios-pbx.test:
     testuser1002:
       customer: 'customerpbx.test'
       password: testuser
@@ -33,9 +34,9 @@ subscribers:
 scenarios:
   - ip: 127.126.0.1
     username: testuser1002
-    domain: spce.test
+    domain: invite.scenarios-pbx.test
     responders:
       - ip: 127.1.0.1
         username: testuser1003
-        domain: spce.test
-        register: yes
+        domain: invite.scenarios-pbx.test
+        register: 'yes'