diff --git a/scenarios/invite_conference_update/0003_test.yml.tt2 b/scenarios/invite_conference_update/0003_test.yml.tt2
index 5ed2f4d9..e451fd10 100644
--- a/scenarios/invite_conference_update/0003_test.yml.tt2
+++ b/scenarios/invite_conference_update/0003_test.yml.tt2
@@ -18,12 +18,12 @@ flow:
   - start|ROUTE_FIND_CALLER:
   - start|ROUTE_AUTH:
   - start|ROUTE_AUTH_HELPER:
-      $x_hdr(From): spce.test
+      $x_hdr(From): invite-conference-update.scenarios.test
       $var(realm_user): testuser1002
-      $var(realm_domain): spce.test
+      $var(realm_domain): invite-conference-update.scenarios.test
   - return|ROUTE_AUTH_HELPER:
       $avp(orig_acc_caller_user): ['testuser1002']
-      $avp(orig_acc_caller_domain): ['spce.test']
+      $avp(orig_acc_caller_domain): ['invite-conference-update.scenarios.test']
   - start|ROUTE_ADD_CALLINFO_REPLY:
   - start|ROUTE_ADD_CALLINFO_CALLER_PRIMARY:
   - return|ROUTE_ADD_CALLINFO_CALLER_PRIMARY:
@@ -66,10 +66,10 @@ flow:
   - return|ROUTE_SET_CALLEE_DIALOG:
       $avp(lua_dlg_profile): [
         "totalaccount:[% customer_test.id %]",
-        "totaluser:[% spce_test.testuser1001.uuid %]",
+        "totaluser:[% invite_conference_update_scenarios_test.testuser1001.uuid %]",
         "total",
         "account:[% customer_test.id %]",
-        "user:[% spce_test.testuser1001.uuid %]"
+        "user:[% invite_conference_update_scenarios_test.testuser1001.uuid %]"
       ]
   - start|ROUTE_BLOCK_IN:
   - return|ROUTE_BLOCK_IN:
@@ -114,18 +114,18 @@ flow:
   - return|ROUTE_SET_CALLER_DIALOG:
       $avp(lua_dlg_profile): [
         "accountout:[% customer_test.id %]",
-        "userout:[% spce_test.testuser1002.uuid %]",
+        "userout:[% invite_conference_update_scenarios_test.testuser1002.uuid %]",
         "account:[% customer_test.id %]",
-        "user:[% spce_test.testuser1002.uuid %]",
+        "user:[% invite_conference_update_scenarios_test.testuser1002.uuid %]",
         "totalaccountout:[% customer_test.id %]",
-        "totaluserout:[% spce_test.testuser1002.uuid %]",
+        "totaluserout:[% invite_conference_update_scenarios_test.testuser1002.uuid %]",
         "totalaccount:[% customer_test.id %]",
-        "totaluser:[% spce_test.testuser1002.uuid %]",
+        "totaluser:[% invite_conference_update_scenarios_test.testuser1002.uuid %]",
         "totalaccount:[% customer_test.id %]",
-        "totaluser:[% spce_test.testuser1001.uuid %]",
+        "totaluser:[% invite_conference_update_scenarios_test.testuser1001.uuid %]",
         "total",
         "account:[% customer_test.id %]",
-        "user:[% spce_test.testuser1001.uuid %]"
+        "user:[% invite_conference_update_scenarios_test.testuser1001.uuid %]"
       ]
   - start|ROUTE_SET_ACC_CALLER_CALL_COUNTERS:
   - return|ROUTE_SET_ACC_CALLER_CALL_COUNTERS:
@@ -178,14 +178,14 @@ sip_out:
       'To: <sip:testuser1001@'
     ]
   - [
-      '^INVITE sip:conf=4311001@conference.local SIP/2.0',
+      '^INVITE sip:conf=[% invite_conference_update_scenarios_test.testuser1001.phone_number %]@conference.local SIP/2.0',
       'CSeq: 2 INVITE',
       'From: <sip:testuser1002@',
       'To: <sip:testuser1001@',
       'Content-Type: application/sdp',
       'P-Caller-UUID: \w+',
-      'P-First-Caller-UPN: 4311002',
-      'P-First-Caller-NPN: 4311002',
+      'P-First-Caller-UPN: [% invite_conference_update_scenarios_test.testuser1002.phone_number %]',
+      'P-First-Caller-NPN: [% invite_conference_update_scenarios_test.testuser1002.phone_number %]',
       'P-Acc-Caller-User: testuser1001',
       'P-Acc-State: cfu',
       'P-App-Param: ;profile=ngcp_cf',
diff --git a/scenarios/invite_conference_update/0005_test.yml.tt2 b/scenarios/invite_conference_update/0005_test.yml.tt2
index 7dfd6b98..cb42bb0f 100644
--- a/scenarios/invite_conference_update/0005_test.yml.tt2
+++ b/scenarios/invite_conference_update/0005_test.yml.tt2
@@ -62,9 +62,9 @@ flow:
   - return|ROUTE_SET_CALLER_DIALOG:
       $avp(lua_dlg_profile): [
         "totalaccountout:[% customer_test.id %]",
-        "totaluserout:[% spce_test.testuser1001.uuid %]",
+        "totaluserout:[% invite_conference_update_scenarios_test.testuser1001.uuid %]",
         "totalaccount:[% customer_test.id %]",
-        "totaluser:[% spce_test.testuser1001.uuid %]",
+        "totaluser:[% invite_conference_update_scenarios_test.testuser1001.uuid %]",
         "peer:appsrv",
         "local"
       ]
@@ -119,20 +119,20 @@ flow:
   - exit|ROUTE_EXIT:
       $avp(lua_dlg_profile): [
         "totalaccountout:[% customer_test.id %]",
-        "totaluserout:[% spce_test.testuser1001.uuid %]",
+        "totaluserout:[% invite_conference_update_scenarios_test.testuser1001.uuid %]",
         "totalaccount:[% customer_test.id %]",
-        "totaluser:[% spce_test.testuser1001.uuid %]",
+        "totaluser:[% invite_conference_update_scenarios_test.testuser1001.uuid %]",
         "peer:appsrv",
         "local"
       ]
 sip_in:
-  - '^INVITE sip:conf=4311001@conference.local SIP/2.0'
+  - '^INVITE sip:conf=[% invite_conference_update_scenarios_test.testuser1001.phone_number %]@conference.local SIP/2.0'
   - 'Contact: <sip:127.0.0.1:5080(;transport=udp)?>'
   - 'CSeq: \d+ INVITE'
   - 'Content-Type: application/sdp'
-  - 'P-Caller-UUID: [% spce_test.testuser1001.uuid %]'
-  - 'P-First-Caller-UPN: 4311002'
-  - 'P-First-Caller-NPN: 4311002'
+  - 'P-Caller-UUID: [% invite_conference_update_scenarios_test.testuser1001.uuid %]'
+  - 'P-First-Caller-UPN: [% invite_conference_update_scenarios_test.testuser1002.phone_number %]'
+  - 'P-First-Caller-NPN: [% invite_conference_update_scenarios_test.testuser1002.phone_number %]'
   - 'P-Acc-Caller-User: testuser1001'
   - 'P-Acc-State: cfu'
 sip_out:
@@ -143,9 +143,9 @@ sip_out:
       'To: <sip:testuser1001@'
     ]
   - [
-      '^INVITE sip:conf=4311001@conference.local SIP/2.0',
+      '^INVITE sip:conf=[% invite_conference_update_scenarios_test.testuser1001.phone_number %]@conference.local SIP/2.0',
       'CSeq: \d+ INVITE',
-      'From: <sip:4311002@',
+      'From: <sip:[% invite_conference_update_scenarios_test.testuser1002.phone_number %]@',
       'To: <sip:testuser1001@',
       'Contact: <sip:127.0.0.1:5080(;transport=udp)?>',
       'Content-Type: application/sdp'
diff --git a/scenarios/invite_conference_update/0014_test.yml.tt2 b/scenarios/invite_conference_update/0014_test.yml.tt2
index 0d9c3f20..6e24cf1c 100644
--- a/scenarios/invite_conference_update/0014_test.yml.tt2
+++ b/scenarios/invite_conference_update/0014_test.yml.tt2
@@ -46,6 +46,6 @@ sip_out:
       'CSeq: \d+ BYE',
       'Max-Forwards: 69',
       'Content-Length: 0',
-      'From: <sip:4311002@',
+      'From: <sip:[% invite_conference_update_scenarios_test.testuser1002.phone_number %]@',
       'To: <sip:testuser1001@'
     ]
diff --git a/scenarios/invite_conference_update/0015_test.yml.tt2 b/scenarios/invite_conference_update/0015_test.yml.tt2
index b51e2d04..26c439ab 100644
--- a/scenarios/invite_conference_update/0015_test.yml.tt2
+++ b/scenarios/invite_conference_update/0015_test.yml.tt2
@@ -15,7 +15,7 @@ flow:
 sip_in:
   - '^SIP/2.0 200 OK'
   - 'CSeq: \d+ BYE'
-  - 'From: <sip:4311002@'
+  - 'From: <sip:[% invite_conference_update_scenarios_test.testuser1002.phone_number %]@'
   - 'Content-Length: 0'
   - 'To: <sip:testuser1001@'
 sip_out:
diff --git a/scenarios/invite_conference_update/callforward.yml b/scenarios/invite_conference_update/callforward.yml.tt2
similarity index 86%
rename from scenarios/invite_conference_update/callforward.yml
rename to scenarios/invite_conference_update/callforward.yml.tt2
index e63e04f3..e0ddcd18 100644
--- a/scenarios/invite_conference_update/callforward.yml
+++ b/scenarios/invite_conference_update/callforward.yml.tt2
@@ -1,5 +1,5 @@
 ---
-testuser1001@spce.test:
+testuser1001@invite-conference-update.scenarios.test:
   destinations:
     destinations:
       - destination: conference
diff --git a/scenarios/invite_conference_update/cdr_test.yml.tt2 b/scenarios/invite_conference_update/cdr_test.yml.tt2
index 03f205f1..3d60d1d7 100644
--- a/scenarios/invite_conference_update/cdr_test.yml.tt2
+++ b/scenarios/invite_conference_update/cdr_test.yml.tt2
@@ -1,15 +1,15 @@
 cdr:
   - source_user: 'testuser1002'
-    source_domain: 'spce.test'
+    source_domain: 'invite-conference-update.scenarios.test'
     source_cli: '4311002'
     destination_user: 'testuser1001'
-    destination_domain: 'spce.test'
+    destination_domain: 'invite-conference-update.scenarios.test'
     destination_user_dialed: 'testuser1001'
     call_type: 'call'
     call_status: 'ok'
     call_code: '200'
   - source_user: 'testuser1001'
-    source_domain: 'spce.test'
+    source_domain: 'invite-conference-update.scenarios.test'
     source_cli: '4311001'
     destination_user: 'conf=4311001'
     destination_domain: 'conference.local'
diff --git a/scenarios/invite_conference_update/prefs.json b/scenarios/invite_conference_update/prefs.json
deleted file mode 100644
index df5d6ff2..00000000
--- a/scenarios/invite_conference_update/prefs.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-        "@spce.test": {
-                "sound_set": "default_soundset"
-        }
-}
diff --git a/scenarios/invite_conference_update/prefs.json.tt2 b/scenarios/invite_conference_update/prefs.json.tt2
new file mode 100644
index 00000000..8185db4b
--- /dev/null
+++ b/scenarios/invite_conference_update/prefs.json.tt2
@@ -0,0 +1,5 @@
+{
+    "@invite-conference-update.scenarios.test": {
+            "sound_set": "default_soundset"
+    }
+}
diff --git a/scenarios/invite_conference_update/scenario.yml b/scenarios/invite_conference_update/scenario.yml
index c6826ace..dd9fe491 100644
--- a/scenarios/invite_conference_update/scenario.yml
+++ b/scenarios/invite_conference_update/scenario.yml
@@ -1,6 +1,7 @@
+---
 test_uuid: invite_conference_update
 domains:
-  'spce.test':
+  invite-conference-update.scenarios.test:
     reseller_id: 1
 customers:
   'customer.test':
@@ -13,7 +14,7 @@ customers:
       billing_profile_id: 1
       reseller_id: 1
 subscribers:
-  spce.test:
+  invite-conference-update.scenarios.test:
     testuser1001:
       customer: 'customer.test'
       password: testuser
@@ -29,10 +30,10 @@ subscribers:
 scenarios:
   - ip: 127.126.0.1
     username: testuser1002
-    domain: spce.test
+    domain: invite-conference-update.scenarios.test
     responders:
       - ip: 127.1.0.1
         username: testuser1001
-        domain: spce.test
-        register: no
-        active: no
+        domain: invite-conference-update.scenarios.test
+        register: 'no'
+        active: 'no'
diff --git a/scenarios/invite_conference_update/soundsets.yml b/scenarios/invite_conference_update/soundsets.yml
index 92422905..535b99c0 100644
--- a/scenarios/invite_conference_update/soundsets.yml
+++ b/scenarios/invite_conference_update/soundsets.yml
@@ -1,22 +1,23 @@
+---
 soundsets:
   'default_soundset':
-      reseller_id: 1
-      sounds:
-        conference_first:
-          filename: sounds/conference_first.wav
-          loopplay: 'false'
-        conference_greeting:
-          filename: sounds/conference_greeting.wav
-          loopplay: 'false'
-        conference_join:
-          filename: sounds/conference_join.wav
-          loopplay: 'false'
-        conference_joined:
-          filename: sounds/conference_joined.wav
-          loopplay: 'false'
-        conference_leave:
-          filename: sounds/conference_leave.wav
-          loopplay: 'false'
-        conference_waiting_music:
-          filename: sounds/conference_waiting_music.wav
-          loopplay: 'false'
+    reseller_id: 1
+    sounds:
+      conference_first:
+        filename: sounds/conference_first.wav
+        loopplay: 'false'
+      conference_greeting:
+        filename: sounds/conference_greeting.wav
+        loopplay: 'false'
+      conference_join:
+        filename: sounds/conference_join.wav
+        loopplay: 'false'
+      conference_joined:
+        filename: sounds/conference_joined.wav
+        loopplay: 'false'
+      conference_leave:
+        filename: sounds/conference_leave.wav
+        loopplay: 'false'
+      conference_waiting_music:
+        filename: sounds/conference_waiting_music.wav
+        loopplay: 'false'