diff --git a/roles/activemq/molecule/default/tests/test_activemq.py b/roles/activemq/molecule/default/tests/test_activemq.py
index d953d3da6..cdfea9287 100644
--- a/roles/activemq/molecule/default/tests/test_activemq.py
+++ b/roles/activemq/molecule/default/tests/test_activemq.py
@@ -12,8 +12,8 @@ def get_ansible_vars(host):
     """Define get_ansible_vars"""
     java_role = "file=../java/vars/main.yml name=java_role"
     activemq_role = "file=../../vars/main.yml name=activemq_role"
-    common_vars = "file=../../../common/vars/main.yml name=common_vars"
-    common_defaults = "file=../../../common/defaults/main.yml name=common_defaults"
+    common_vars = "file=../../../../collections/alfresco/platform/roles/common/vars/main.yml name=common_vars"
+    common_defaults = "file=../../../../collections/alfresco/platform/roles/common/defaults/main.yml name=common_defaults"
     group_vars = "file=../../../../group_vars/all.yml name=group_vars"
     secrets_vars = "file=../../../../vars/secrets.yml name=secrets_vars"
     ansible_vars = host.ansible("include_vars", java_role)["ansible_facts"]["java_role"]
diff --git a/roles/java/molecule/default/tests/test_java.py b/roles/java/molecule/default/tests/test_java.py
index 62e47cde1..808f55193 100644
--- a/roles/java/molecule/default/tests/test_java.py
+++ b/roles/java/molecule/default/tests/test_java.py
@@ -8,8 +8,8 @@
 def get_ansible_vars(host):
     """Define get_ansible_vars"""
     java_role = "file=../../vars/main.yml name=java_role"
-    common_vars = "file=../../../common/vars/main.yml name=common_vars"
-    common_defaults = "file=../../../common/defaults/main.yml name=common_defaults"
+    common_vars = "file=../../../../collections/alfresco/platform/roles/common/vars/main.yml name=common_vars"
+    common_defaults = "file=../../../../collections/alfresco/platform/roles/common/defaults/main.yml name=common_defaults"
     group_vars = "file=../../../../group_vars/all.yml name=group_vars"
     ansible_vars = host.ansible(
             "include_vars",
diff --git a/roles/nginx/molecule/default/tests/test_nginx.py b/roles/nginx/molecule/default/tests/test_nginx.py
index 04959074f..ca0aa01ed 100644
--- a/roles/nginx/molecule/default/tests/test_nginx.py
+++ b/roles/nginx/molecule/default/tests/test_nginx.py
@@ -10,8 +10,8 @@
 @pytest.fixture(scope="module")
 def get_ansible_vars(host):
     """Define get_ansible_vars"""
-    common_vars = "file=../../../common/vars/main.yml name=common_vars"
-    common_defaults = "file=../../../common/defaults/main.yml name=common_defaults"
+    common_vars = "file=../../../../collections/alfresco/platform/roles/common/vars/main.yml name=common_vars"
+    common_defaults = "file=../../../../collections/alfresco/platform/roles/common/defaults/main.yml name=common_defaults"
     nginx_vars = "file=../../vars/main.yml name=nginx_vars"
     distribution_name = host.ansible("setup")["ansible_facts"]["ansible_distribution"]
     distribution_version = host.ansible("setup")["ansible_facts"]["ansible_distribution_version"]
diff --git a/roles/repository/molecule/default/tests/test_repository.py b/roles/repository/molecule/default/tests/test_repository.py
index c01acb26f..7d8f4e1ef 100644
--- a/roles/repository/molecule/default/tests/test_repository.py
+++ b/roles/repository/molecule/default/tests/test_repository.py
@@ -17,8 +17,8 @@ def get_ansible_vars(host):
     repository_role = "file=../../vars/main.yml name=repository_role"
     tomcat_role = "file=../tomcat/vars/main.yml name=tomcat_role"
     java_role = "file=../java/vars/main.yml name=java_role"
-    common_vars = "file=../../../common/vars/main.yml name=common_vars"
-    common_defaults = "file=../../../common/defaults/main.yml name=common_defaults"
+    common_vars = "file=../../../../collections/alfresco/platform/roles/common/vars/main.yml name=common_vars"
+    common_defaults = "file=../../../../collections/alfresco/platform/roles/common/defaults/main.yml name=common_defaults"
     group_vars = "file=../../../../group_vars/all.yml name=group_vars"
     ansible_vars = host.ansible("include_vars", group_vars)["ansible_facts"]["group_vars"]
     ansible_vars.update(host.ansible("include_vars", common_defaults)["ansible_facts"]["common_defaults"])
diff --git a/roles/search/molecule/default/tests/test_search.py b/roles/search/molecule/default/tests/test_search.py
index 65e73f0dc..c3e670757 100644
--- a/roles/search/molecule/default/tests/test_search.py
+++ b/roles/search/molecule/default/tests/test_search.py
@@ -12,9 +12,9 @@
 def get_ansible_vars(host):
     """Define get_ansible_vars"""
     java_role = "file=../java/vars/main.yml name=java_role"
-    common_vars = "file=../../../common/vars/main.yml name=common_vars"
-    common_defaults = "file=../../../common/defaults/main.yml name=common_defaults"
-    common_hosts = "file=../../../common/defaults/main.yml name=common_hosts"
+    common_vars = "file=../../../../collections/alfresco/platform/roles/common/vars/main.yml name=common_vars"
+    common_defaults = "file=../../../../collections/alfresco/platform/roles/common/defaults/main.yml name=common_defaults"
+    common_hosts = "file=../../../../collections/alfresco/platform/roles/common/defaults/main.yml name=common_hosts"
     search_services = "file=../../vars/main.yml name=search_services"
     ansible_vars = host.ansible("include_vars", java_role)["ansible_facts"]["java_role"]
     ansible_vars.update(host.ansible("include_vars", java_role)["ansible_facts"]["java_role"])
diff --git a/roles/sfs/molecule/default/tests/test_sfs.py b/roles/sfs/molecule/default/tests/test_sfs.py
index c0a97951f..bb740ca0a 100644
--- a/roles/sfs/molecule/default/tests/test_sfs.py
+++ b/roles/sfs/molecule/default/tests/test_sfs.py
@@ -11,9 +11,9 @@
 def get_ansible_vars(host):
     """Define get_ansible_vars"""
     java_role = "file=../roles/java/vars/main.yml name=java_role"
-    common_vars = "file=../../../common/vars/main.yml name=common_vars"
-    common_defaults = "file=../../../common/defaults/main.yml name=common_defaults"
-    common_hosts = "file=../../../common/vars/hosts.yml name=common_hosts"
+    common_vars = "file=../../../../collections/alfresco/platform/roles/common/vars/main.yml name=common_vars"
+    common_defaults = "file=../../../../collections/alfresco/platform/roles/common/defaults/main.yml name=common_defaults"
+    common_hosts = "file=../../../../collections/alfresco/platform/roles/common/vars/hosts.yml name=common_hosts"
     ansible_vars = host.ansible("include_vars", java_role)["ansible_facts"]["java_role"]
     ansible_vars.update(host.ansible("include_vars", common_vars)["ansible_facts"]["common_vars"])
     ansible_vars.update(host.ansible("include_vars", common_hosts)["ansible_facts"]["common_hosts"])
diff --git a/roles/sync/molecule/default/tests/test_sync.py b/roles/sync/molecule/default/tests/test_sync.py
index 82bdfc8f5..83dbcab51 100644
--- a/roles/sync/molecule/default/tests/test_sync.py
+++ b/roles/sync/molecule/default/tests/test_sync.py
@@ -11,8 +11,8 @@
 def get_ansible_vars(host):
     """Define get_ansible_vars"""
     java_role = "file=../java/vars/main.yml name=java_role"
-    common_vars = "file=../../../common/vars/main.yml name=common_vars"
-    common_defaults = "file=../../../common/defaults/main.yml name=common_defaults"
+    common_vars = "file=../../../../collections/alfresco/platform/roles/common/vars/main.yml name=common_vars"
+    common_defaults = "file=../../../../collections/alfresco/platform/roles/common/defaults/main.yml name=common_defaults"
     common_hosts = "file=../../../../group_vars/all.yml name=common_hosts"
     syncservices = "file=../../vars/main.yml name=syncservices"
     ansible_vars = host.ansible("include_vars", java_role)["ansible_facts"]["java_role"]
diff --git a/roles/tomcat/molecule/default/tests/test_tomcat.py b/roles/tomcat/molecule/default/tests/test_tomcat.py
index 7be4289c4..803c9c4cd 100644
--- a/roles/tomcat/molecule/default/tests/test_tomcat.py
+++ b/roles/tomcat/molecule/default/tests/test_tomcat.py
@@ -8,8 +8,8 @@ def get_ansible_vars(host):
     """Define get_ansible_vars"""
     java_role = "file=../java/vars/main.yml name=java_role"
     tomcat_role = "file=../../vars/main.yml name=tomcat_role"
-    common_vars = "file=../../../common/vars/main.yml name=common_vars"
-    common_defaults = "file=../../../common/defaults/main.yml name=common_defaults"
+    common_vars = "file=../../../../collections/alfresco/platform/roles/common/vars/main.yml name=common_vars"
+    common_defaults = "file=../../../../collections/alfresco/platform/roles/common/defaults/main.yml name=common_defaults"
     group_vars = "file=../../../../group_vars/all.yml name=group_vars"
     ansible_vars = host.ansible("include_vars", java_role)["ansible_facts"]["java_role"]
     ansible_vars.update(host.ansible("include_vars", tomcat_role)["ansible_facts"]["tomcat_role"])
diff --git a/roles/transformers/molecule/default/tests/test_transform.py b/roles/transformers/molecule/default/tests/test_transform.py
index 69625da7f..05f5b722e 100644
--- a/roles/transformers/molecule/default/tests/test_transform.py
+++ b/roles/transformers/molecule/default/tests/test_transform.py
@@ -11,9 +11,9 @@
 def get_ansible_vars(host):
     """Define get_ansible_vars"""
     java_role = "file=../java/vars/main.yml name=java_role"
-    common_vars = "file=../../../common/vars/main.yml name=common_vars"
-    common_defaults = "file=../../../common/defaults/main.yml name=common_defaults"
-    common_hosts = "file=../../../common/vars/hosts.yml name=common_hosts"
+    common_vars = "file=../../../../collections/alfresco/platform/roles/common/vars/main.yml name=common_vars"
+    common_defaults = "file=../../../../collections/alfresco/platform/roles/common/defaults/main.yml name=common_defaults"
+    common_hosts = "file=../../../../collections/alfresco/platform/roles/common/vars/hosts.yml name=common_hosts"
     transform_services = "file=../../vars/main.yml name=transform_services"
     ansible_vars = host.ansible("include_vars", java_role)["ansible_facts"]["java_role"]
     ansible_vars.update(host.ansible("include_vars", java_role)["ansible_facts"]["java_role"])
diff --git a/roles/trouter/molecule/default/tests/test_trouter.py b/roles/trouter/molecule/default/tests/test_trouter.py
index 1ace30fbf..8a0672125 100644
--- a/roles/trouter/molecule/default/tests/test_trouter.py
+++ b/roles/trouter/molecule/default/tests/test_trouter.py
@@ -11,9 +11,9 @@
 def get_ansible_vars(host):
     """Define get_ansible_vars"""
     java_role = "file=../roles/java/vars/main.yml name=java_role"
-    common_vars = "file=../../../common/vars/main.yml name=common_vars"
-    common_defaults = "file=../../../common/defaults/main.yml name=common_defaults"
-    common_hosts = "file=../../../common/vars/hosts.yml name=common_hosts"
+    common_vars = "file=../../../../collections/alfresco/platform/roles/common/vars/main.yml name=common_vars"
+    common_defaults = "file=../../../../collections/alfresco/platform/roles/common/defaults/main.yml name=common_defaults"
+    common_hosts = "file=../../../../collections/alfresco/platform/roles/common/vars/hosts.yml name=common_hosts"
     ansible_vars = host.ansible("include_vars", java_role)["ansible_facts"]["java_role"]
     ansible_vars.update(host.ansible("include_vars", common_vars)["ansible_facts"]["common_vars"])
     ansible_vars.update(host.ansible("include_vars", common_hosts)["ansible_facts"]["common_hosts"])