diff --git a/roles/yoda_rulesets/defaults/main.yml b/roles/yoda_rulesets/defaults/main.yml
index 957ebe46a..b107a5346 100644
--- a/roles/yoda_rulesets/defaults/main.yml
+++ b/roles/yoda_rulesets/defaults/main.yml
@@ -92,7 +92,7 @@ metadata_schemas:
   - name: default-3
     install: true
     active: true
-  - name: epos-0
+  - name: epos-msl-0
     install: true
     active: true
   - name: hptlab-0
diff --git a/roles/yoda_test/defaults/main.yml b/roles/yoda_test/defaults/main.yml
index c1555a67e..8ddc00491 100644
--- a/roles/yoda_test/defaults/main.yml
+++ b/roles/yoda_test/defaults/main.yml
@@ -59,7 +59,7 @@ test_groups:
   - {groupName: research-default-1,    category: test-automation, subcategory: metadata-schemas, dataClassification: unspecified, schema_id: default-1}
   - {groupName: research-default-2,    category: test-automation, subcategory: metadata-schemas, dataClassification: unspecified, schema_id: default-2}
   - {groupName: research-default-3,    category: test-automation, subcategory: metadata-schemas, dataClassification: unspecified, schema_id: default-3}
-  - {groupName: research-epos-0,       category: test-automation, subcategory: metadata-schemas, dataClassification: unspecified, schema_id: epos-0}
+  - {groupName: research-epos-msl-0,   category: test-automation, subcategory: metadata-schemas, dataClassification: unspecified, schema_id: epos-msl-0}
   - {groupName: research-hptlab-0,     category: test-automation, subcategory: metadata-schemas, dataClassification: unspecified, schema_id: hptlab-0}
   - {groupName: research-hptlab-1,     category: test-automation, subcategory: metadata-schemas, dataClassification: unspecified, schema_id: hptlab-1}
   - {groupName: research-teclab-0,     category: test-automation, subcategory: metadata-schemas, dataClassification: unspecified, schema_id: teclab-0}
@@ -132,8 +132,8 @@ test_group_users:
   - {groupName: research-default-3, user: researcher,                    role: normal}
   - {groupName: research-default-3, user: functionaladminpriv,           role: manager}
 
-  - {groupName: research-epos-0, user: researcher,                    role: normal}
-  - {groupName: research-epos-0, user: functionaladminpriv,           role: manager}
+  - {groupName: research-epos-msl-0, user: researcher,                    role: normal}
+  - {groupName: research-epos-msl-0, user: functionaladminpriv,           role: manager}
 
   - {groupName: research-hptlab-0, user: researcher,                    role: normal}
   - {groupName: research-hptlab-0, user: functionaladminpriv,           role: manager}
@@ -231,8 +231,8 @@ test_group_eus_users:
   - {groupName: research-default-3, user: researcher@yoda.test,          role: normal}
   - {groupName: research-default-3, user: functionaladminpriv@yoda.test, role: manager}
 
-  - {groupName: research-epos-0, user: researcher@yoda.test,          role: normal}
-  - {groupName: research-epos-0, user: functionaladminpriv@yoda.test, role: manager}
+  - {groupName: research-epos-msl-0, user: researcher@yoda.test,          role: normal}
+  - {groupName: research-epos-msl-0, user: functionaladminpriv@yoda.test, role: manager}
 
   - {groupName: research-hptlab-0, user: researcher@yoda.test,          role: normal}
   - {groupName: research-hptlab-0, user: functionaladminpriv@yoda.test, role: manager}
@@ -289,7 +289,7 @@ deletion_research_groups:
   - research: default-1
   - research: default-2
   - research: default-3
-  - research: epos-0
+  - research: epos-msl-0
   - research: hptlab-0
   - research: hptlab-1
   - research: teclab-0