diff --git a/scenarios/invite_tcp_udp_reinvite/0003_test.yml.tt2 b/scenarios/invite_tcp_udp_reinvite/0003_test.yml.tt2
index 3c6c0fba..6aed268a 100644
--- a/scenarios/invite_tcp_udp_reinvite/0003_test.yml.tt2
+++ b/scenarios/invite_tcp_udp_reinvite/0003_test.yml.tt2
@@ -23,8 +23,8 @@ flow:
       $avp(proto): ["tcp"]
 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'
@@ -32,12 +32,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_tcp_udp_reinvite/0005_test.yml.tt2 b/scenarios/invite_tcp_udp_reinvite/0005_test.yml.tt2
index 7c553699..1cfae795 100644
--- a/scenarios/invite_tcp_udp_reinvite/0005_test.yml.tt2
+++ b/scenarios/invite_tcp_udp_reinvite/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-tcp-udp-reinvite.scenarios.test
+      $var(realm_user): [% scenarios.0.username %]
+      $var(realm_domain): invite-tcp-udp-reinvite.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-tcp-udp-reinvite.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_tcp_udp_reinvite_scenarios_test.testuser1003.uuid %]",
         "total",
         "account:[% customer_test.id %]",
-        "user:[% spce_test.testuser1003.uuid %]"
+        "user:[% invite_tcp_udp_reinvite_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_tcp_udp_reinvite_scenarios_test.testuser1003.uuid %]",
         "total",
         "account:[% customer_test.id %]",
-        "user:[% spce_test.testuser1003.uuid %]"
+        "user:[% invite_tcp_udp_reinvite_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_tcp_udp_reinvite_scenarios_test.testuser1002.uuid %]",
         "account:[% customer_test.id %]",
-        "user:[% spce_test.testuser1002.uuid %]",
+        "user:[% invite_tcp_udp_reinvite_scenarios_test.testuser1002.uuid %]",
         "totalaccountout:[% customer_test.id %]",
-        "totaluserout:[% spce_test.testuser1002.uuid %]",
+        "totaluserout:[% invite_tcp_udp_reinvite_scenarios_test.testuser1002.uuid %]",
         "totalaccount:[% customer_test.id %]",
-        "totaluser:[% spce_test.testuser1002.uuid %]",
+        "totaluser:[% invite_tcp_udp_reinvite_scenarios_test.testuser1002.uuid %]",
         "local",
         "totalaccount:[% customer_test.id %]",
-        "totaluser:[% spce_test.testuser1003.uuid %]",
+        "totaluser:[% invite_tcp_udp_reinvite_scenarios_test.testuser1003.uuid %]",
         "total",
         "account:[% customer_test.id %]",
-        "user:[% spce_test.testuser1003.uuid %]"
+        "user:[% invite_tcp_udp_reinvite_scenarios_test.testuser1003.uuid %]"
       ]
   - start|ROUTE_ACC_CALLER:
   - start|ROUTE_SET_ACC_CALLER_CALL_COUNTERS:
@@ -193,50 +193,50 @@ flow:
       $avp(proto): ["tcp"]
       $avp(lua_dlg_profile): [
         "accountout:[% customer_test.id %]",
-        "userout:[% spce_test.testuser1002.uuid %]",
+        "userout:[% invite_tcp_udp_reinvite_scenarios_test.testuser1002.uuid %]",
         "account:[% customer_test.id %]",
-        "user:[% spce_test.testuser1002.uuid %]",
+        "user:[% invite_tcp_udp_reinvite_scenarios_test.testuser1002.uuid %]",
         "totalaccountout:[% customer_test.id %]",
-        "totaluserout:[% spce_test.testuser1002.uuid %]",
+        "totaluserout:[% invite_tcp_udp_reinvite_scenarios_test.testuser1002.uuid %]",
         "totalaccount:[% customer_test.id %]",
-        "totaluser:[% spce_test.testuser1002.uuid %]",
+        "totaluser:[% invite_tcp_udp_reinvite_scenarios_test.testuser1002.uuid %]",
         "local",
         "totalaccount:[% customer_test.id %]",
-        "totaluser:[% spce_test.testuser1003.uuid %]",
+        "totaluser:[% invite_tcp_udp_reinvite_scenarios_test.testuser1003.uuid %]",
         "total",
         "account:[% customer_test.id %]",
-        "user:[% spce_test.testuser1003.uuid %]"
+        "user:[% invite_tcp_udp_reinvite_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_tcp_udp_reinvite_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-Asserted-Identity: <sip:4311002@',
-      'P-Called-Party-ID: <sip:testuser1003@',
+      'P-Caller-UUID: [% invite_tcp_udp_reinvite_scenarios_test.testuser1002.uuid %]',
+      'P-Callee-UUID: [% invite_tcp_udp_reinvite_scenarios_test.testuser1003.uuid %]',
+      'P-Asserted-Identity: <sip:[% invite_tcp_udp_reinvite_scenarios_test.testuser1002.phone_number %]@',
+      '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_tcp_udp_reinvite/0017_test.yml.tt2 b/scenarios/invite_tcp_udp_reinvite/0017_test.yml.tt2
index 9d7219a5..a6b5416d 100644
--- a/scenarios/invite_tcp_udp_reinvite/0017_test.yml.tt2
+++ b/scenarios/invite_tcp_udp_reinvite/0017_test.yml.tt2
@@ -26,20 +26,20 @@ flow:
       $avp(proto): ["udp"]
 sip_in:
   - '^INVITE'
-  - 'Contact: <sip:(testuser1003@)?127.0.0.1:5080(;transport=udp)?>'
+  - 'Contact: <sip:([% scenarios.0.responders.0.username %]@)?127.0.0.1:5080(;transport=udp)?>'
   - 'CSeq: \d+ INVITE'
   - 'Content-Type: application/sdp'
 sip_out:
   - [
       '^SIP/2.0 100 Trying',
       'CSeq: \d+ INVITE',
-      'From: <sip:testuser1003@',
-      'To: <sip:4311002@'
+      'From: <sip:[% scenarios.0.responders.0.username %]@',
+      'To: <sip:[% invite_tcp_udp_reinvite_scenarios_test.testuser1002.phone_number %]@'
     ]
   - [
-      '^INVITE sip:testuser1002@',
+      '^INVITE sip:[% scenarios.0.username %]@',
       'CSeq: \d+ INVITE',
-      'From: <sip:testuser1003@',
-      'To: <sip:testuser1002@',
+      'From: <sip:[% scenarios.0.responders.0.username %]@',
+      'To: <sip:[% scenarios.0.username %]@',
       'Content-Type: application/sdp'
     ]
diff --git a/scenarios/invite_tcp_udp_reinvite/0023_test.yml.tt2 b/scenarios/invite_tcp_udp_reinvite/0023_test.yml.tt2
index d0d5b737..2e5f9bd9 100644
--- a/scenarios/invite_tcp_udp_reinvite/0023_test.yml.tt2
+++ b/scenarios/invite_tcp_udp_reinvite/0023_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:testuser1002@'
+  - 'Contact: <sip:[% scenarios.0.username %]@'
   - 'CSeq: \d+ 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: \d+ 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: \d+ BYE',
       'Max-Forwards: 68',
       'Content-Length: 0',
-      'From: <sip:4311002@',
-      'To: <sip:testuser1003@'
+      'From: <sip:[% invite_tcp_udp_reinvite_scenarios_test.testuser1002.phone_number %]@',
+      'To: <sip:[% scenarios.0.responders.0.username %]@'
     ]
diff --git a/scenarios/invite_tcp_udp_reinvite/cdr_test.yml.tt2 b/scenarios/invite_tcp_udp_reinvite/cdr_test.yml.tt2
index 7e903ea7..0bbb2e8b 100644
--- a/scenarios/invite_tcp_udp_reinvite/cdr_test.yml.tt2
+++ b/scenarios/invite_tcp_udp_reinvite/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-tcp-udp-reinvite.scenarios.test'
+    source_cli: '[% invite_tcp_udp_reinvite_scenarios_test.testuser1002.phone_number %]'
+    destination_user: '[% scenarios.0.responders.0.username %]'
+    destination_domain: 'invite-tcp-udp-reinvite.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_tcp_udp_reinvite/prefs.json b/scenarios/invite_tcp_udp_reinvite/prefs.json
deleted file mode 100644
index 797077c9..00000000
--- a/scenarios/invite_tcp_udp_reinvite/prefs.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-    "testuser1003@spce.test": {
-        "allow_out_foreign_domain": true
-    }
-}
diff --git a/scenarios/invite_tcp_udp_reinvite/prefs.json.tt2 b/scenarios/invite_tcp_udp_reinvite/prefs.json.tt2
new file mode 100644
index 00000000..0bf7bd86
--- /dev/null
+++ b/scenarios/invite_tcp_udp_reinvite/prefs.json.tt2
@@ -0,0 +1,5 @@
+{
+    "[% scenarios.0.responders.0.username %]@invite-tcp-udp-reinvite.scenarios.test": {
+        "allow_out_foreign_domain": true
+    }
+}
diff --git a/scenarios/invite_tcp_udp_reinvite/scenario.yml b/scenarios/invite_tcp_udp_reinvite/scenario.yml
index ec051dad..a7204c4b 100644
--- a/scenarios/invite_tcp_udp_reinvite/scenario.yml
+++ b/scenarios/invite_tcp_udp_reinvite/scenario.yml
@@ -1,6 +1,7 @@
+---
 test_uuid: invite_tcp_udp_reinvite
 domains:
-  'spce.test':
+  invite-tcp-udp-reinvite.scenarios.test:
     reseller_id: 1
 customers:
   'customer.test':
@@ -13,7 +14,7 @@ customers:
       billing_profile_id: 1
       reseller_id: 1
 subscribers:
-  spce.test:
+  invite-tcp-udp-reinvite.scenarios.test:
     testuser1003:
       customer: 'customer.test'
       password: testuser
@@ -33,11 +34,11 @@ subscribers:
 scenarios:
   - ip: 127.126.0.1
     username: testuser1002
-    domain: spce.test
+    domain: invite-tcp-udp-reinvite.scenarios.test
     proto: tcp
     responders:
       - ip: 127.1.0.1
         username: testuser1003
-        domain: spce.test
-        register: yes
+        domain: invite-tcp-udp-reinvite.scenarios.test
+        register: 'yes'
         proto: udp