From 902f35b90a0f693ecf849e02eb7731fcf446800c Mon Sep 17 00:00:00 2001
From: Carlos Camacho <carloscamachoucv@gmail.com>
Date: Mon, 27 Sep 2021 13:41:20 +0200
Subject: [PATCH] feat: convert to FQCN

This commit convert all the roles calls
to their corresponding fully qualified collection name.
---
 .github/workflows/distro_test.yml             |  5 ++++-
 .github/workflows/docs_build_pr.yml           |  9 ++++++++
 .github/workflows/release.yml                 |  9 ++++++++
 ci/install_gitlab_node.sh                     |  4 ++++
 docs/src/usage.rst                            |  4 ++--
 kubeinit/playbook.yml                         | 22 +++++++++----------
 .../playbooks/submariner-subctl-verify.yml    |  4 ++--
 kubeinit/playbooks/submariner.yml             |  4 ++--
 kubeinit/roles/kubeinit_apache/tasks/main.yml |  2 +-
 kubeinit/roles/kubeinit_bind/tasks/main.yml   |  2 +-
 kubeinit/roles/kubeinit_cdk/tasks/main.yml    |  4 ++--
 .../tasks/post_configure_guest.yml            |  2 +-
 .../tasks/post_deployment_tasks.yml           |  2 +-
 .../kubeinit_cdk/tasks/prepare_cluster.yml    |  4 ++--
 .../roles/kubeinit_dnsmasq/tasks/main.yml     |  2 +-
 kubeinit/roles/kubeinit_eks/tasks/main.yml    |  4 ++--
 .../tasks/post_deployment_tasks.yml           |  2 +-
 .../kubeinit_eks/tasks/prepare_cluster.yml    |  4 ++--
 .../roles/kubeinit_haproxy/tasks/main.yml     |  2 +-
 kubeinit/roles/kubeinit_k8s/tasks/main.yml    |  4 ++--
 .../tasks/post_deployment_tasks.yml           |  2 +-
 .../kubeinit_k8s/tasks/prepare_cluster.yml    |  4 ++--
 kubeinit/roles/kubeinit_kid/tasks/main.yml    |  4 ++--
 .../tasks/post_configure_guest.yml            |  2 +-
 .../tasks/post_deployment_tasks.yml           |  2 +-
 .../kubeinit_kid/tasks/prepare_cluster.yml    |  4 ++--
 .../tasks/deploy_centos_guest.yml             | 10 ++++-----
 .../tasks/deploy_debian_guest.yml             | 12 +++++-----
 .../tasks/deploy_ubuntu_guest.yml             | 12 +++++-----
 .../tasks/download_cloud_images.yml           |  2 +-
 kubeinit/roles/kubeinit_nexus/tasks/main.yml  |  2 +-
 kubeinit/roles/kubeinit_okd/tasks/main.yml    |  8 +++----
 .../tasks/post_deployment_tasks.yml           |  4 ++--
 .../kubeinit_okd/tasks/prepare_cluster.yml    |  8 +++----
 .../tasks/cleanup_hypervisors.yml             |  6 ++---
 .../tasks/prepare_hypervisor.yml              |  2 +-
 .../roles/kubeinit_registry/tasks/main.yml    |  2 +-
 kubeinit/roles/kubeinit_rke/tasks/main.yml    |  4 ++--
 .../tasks/post_configure_guest.yml            |  2 +-
 .../tasks/post_deployment_tasks.yml           |  2 +-
 .../kubeinit_rke/tasks/prepare_cluster.yml    |  4 ++--
 .../tasks/00_create_service_pod.yml           |  2 +-
 .../tasks/create_network.yml                  |  4 ++--
 .../tasks/create_provision_container.yml      |  4 ++--
 .../roles/kubeinit_services/tasks/main.yml    |  4 ++--
 .../tasks/prepare_services.yml                |  4 ++--
 .../tasks/start_services_containers.yml       | 12 +++++-----
 .../roles/kubeinit_validations/tasks/main.yml |  2 +-
 48 files changed, 125 insertions(+), 100 deletions(-)

diff --git a/.github/workflows/distro_test.yml b/.github/workflows/distro_test.yml
index 85d4428bd..1285fe067 100644
--- a/.github/workflows/distro_test.yml
+++ b/.github/workflows/distro_test.yml
@@ -80,8 +80,11 @@ jobs:
         sed -i -E "s/.*compute-01/#compute-01/g" ./hosts/cdk/inventory
         sed -i -E "s/.*compute-02/#compute-02/g" ./hosts/cdk/inventory
         sed -i -E "/service-01 ansible_host/ s/type=virtual/type=container/g" ./hosts/cdk/inventory
-    - name: Run the deployment for a container
+    - name: Run the deployment from a container
       run: |
+        # There is no need to install the collection before this step.
+        # The collection is compiled and installed when we create
+        # the kubeinit container using the code in the current path.
         sudo su <<EOF
             whoami
             podman build -t kubeinit/kubeinit .
diff --git a/.github/workflows/docs_build_pr.yml b/.github/workflows/docs_build_pr.yml
index 3a66097e1..fa8c0515b 100644
--- a/.github/workflows/docs_build_pr.yml
+++ b/.github/workflows/docs_build_pr.yml
@@ -34,6 +34,15 @@ jobs:
           sudo python3 -m pip install --upgrade setuptools
           sudo python3 -m pip install --upgrade ansible-inventory-grapher
           sudo python3 -m pip install --upgrade ansible-playbook-grapher
+          sudo python3 -m pip install --upgrade shyaml
+
+      - name: Install kubeinit's collection
+        run: |
+          cd kubeinit
+          rm -rf ~/.ansible/collections/ansible_collections/kubeinit/kubeinit
+          ansible-galaxy collection build -v --force --output-path releases/
+          ansible-galaxy collection install --force --force-with-deps releases/kubeinit-kubeinit-`cat galaxy.yml | shyaml get-value version`.tar.gz
+          cd ..
 
       - name: Render the plantuml diagrams
         run: |
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 57d229c16..0c50428d6 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -93,6 +93,15 @@ jobs:
           sudo python3 -m pip install --upgrade setuptools
           sudo python3 -m pip install --upgrade ansible-inventory-grapher
           sudo python3 -m pip install --upgrade ansible-playbook-grapher
+          sudo python3 -m pip install --upgrade shyaml
+
+      - name: Install kubeinit's collection
+        run: |
+          cd kubeinit
+          rm -rf ~/.ansible/collections/ansible_collections/kubeinit/kubeinit
+          ansible-galaxy collection build -v --force --output-path releases/
+          ansible-galaxy collection install --force --force-with-deps releases/kubeinit-kubeinit-`cat galaxy.yml | shyaml get-value version`.tar.gz
+          cd ..
 
       - name: Render the plantuml diagrams
         run: |
diff --git a/ci/install_gitlab_node.sh b/ci/install_gitlab_node.sh
index b58563118..52549d853 100755
--- a/ci/install_gitlab_node.sh
+++ b/ci/install_gitlab_node.sh
@@ -56,6 +56,10 @@ if [ -f /etc/redhat-release ] || [ -f /etc/fedora-release ]; then
     sudo yum install python3 python3-pip -y
     sudo yum install nano git podman -y
 
+    # Configure git with some mock data
+    git config --global user.email "bot@kubeinit.com"
+    git config --global user.name "kubeinit-bot"
+
     # ARA required packages
     sudo yum install gcc python3-devel libffi-devel openssl-devel redhat-rpm-config -y
     sudo yum install sqlite -y
diff --git a/docs/src/usage.rst b/docs/src/usage.rst
index ae71f2c81..3bb1a7513 100644
--- a/docs/src/usage.rst
+++ b/docs/src/usage.rst
@@ -164,11 +164,11 @@ from the project's root folder:
       tasks:
         - name: Run the prepare tasks
           ansible.builtin.include_role:
-            name: "../../roles/kubeinit_prepare"
+            name: kubeinit.kubeinit.kubeinit_prepare
             tasks_from: main.yml
         - name: Clean the environment
           ansible.builtin.include_role:
-            name: ../../roles/kubeinit_libvirt
+            name: kubeinit.kubeinit.kubeinit_libvirt
             tasks_from: 10_cleanup
     EOF
     # Run the cleanup playbook
diff --git a/kubeinit/playbook.yml b/kubeinit/playbook.yml
index c9690b894..880d0c790 100644
--- a/kubeinit/playbook.yml
+++ b/kubeinit/playbook.yml
@@ -29,7 +29,7 @@
   tasks:
     - name: task-prepare-hypervisors
       ansible.builtin.include_role:
-        name: "../../roles/kubeinit_prepare"
+        name: kubeinit.kubeinit.kubeinit_prepare
         tasks_from: prepare_hypervisors.yml
         public: true
 
@@ -39,7 +39,7 @@
   tasks:
     - name: Prepare each hypervisor in the deployment
       ansible.builtin.include_role:
-        name: "../../roles/kubeinit_prepare"
+        name: kubeinit.kubeinit.kubeinit_prepare
         tasks_from: prepare_hypervisor.yml
         public: true
 
@@ -50,42 +50,42 @@
   tasks:
     - name: task-prepare-environment
       ansible.builtin.include_role:
-        name: "../../roles/kubeinit_prepare"
+        name: kubeinit.kubeinit.kubeinit_prepare
         public: true
     - name: task-cleanup-hypervisors
       ansible.builtin.include_role:
-        name: "../../roles/kubeinit_prepare"
+        name: kubeinit.kubeinit.kubeinit_prepare
         tasks_from: cleanup_hypervisors.yml
         public: true
     - name: task-run-validations
       ansible.builtin.include_role:
-        name: "../../roles/kubeinit_validations"
+        name: kubeinit.kubeinit.kubeinit_validations
         public: true
     - name: task-create-network
       ansible.builtin.include_role:
-        name: "../../roles/kubeinit_services"
+        name: kubeinit.kubeinit.kubeinit_services
         tasks_from: create_network.yml
         public: true
     - name: task-create-services
       ansible.builtin.include_role:
-        name: "../../roles/kubeinit_services"
+        name: kubeinit.kubeinit.kubeinit_services
         public: true
     - name: task-prepare-cluster
       ansible.builtin.include_role:
-        name: "../../roles/kubeinit_{{ kubeinit_inventory_cluster_distro }}"
+        name: "kubeinit.kubeinit.kubeinit_{{ kubeinit_inventory_cluster_distro }}"
         tasks_from: prepare_cluster.yml
         public: true
     - name: task-download-images
       ansible.builtin.include_role:
-        name: "../../roles/kubeinit_libvirt"
+        name: kubeinit.kubeinit.kubeinit_libvirt
         tasks_from: download_cloud_images.yml
         public: true
     - name: task-deploy-cluster
       ansible.builtin.include_role:
-        name: "../../roles/kubeinit_{{ kubeinit_inventory_cluster_distro }}"
+        name: "kubeinit.kubeinit.kubeinit_{{ kubeinit_inventory_cluster_distro }}"
         public: true
     - name: task-post-deployment
       ansible.builtin.include_role:
-        name: "../../roles/kubeinit_{{ kubeinit_inventory_cluster_distro }}"
+        name: "kubeinit.kubeinit.kubeinit_{{ kubeinit_inventory_cluster_distro }}"
         tasks_from: post_deployment_tasks.yml
         public: true
diff --git a/kubeinit/playbooks/submariner-subctl-verify.yml b/kubeinit/playbooks/submariner-subctl-verify.yml
index f096302c4..aaf40ed7f 100644
--- a/kubeinit/playbooks/submariner-subctl-verify.yml
+++ b/kubeinit/playbooks/submariner-subctl-verify.yml
@@ -29,7 +29,7 @@
   tasks:
     - name: Run the prepare tasks
       ansible.builtin.include_role:
-        name: "../../roles/kubeinit_prepare"
+        name: kubeinit.kubeinit.kubeinit_prepare
         public: true
 
 - name: Main playbook to deploy submariner
@@ -38,6 +38,6 @@
   tasks:
     - name: Verify submariner
       ansible.builtin.import_role:
-        name: "../../roles/kubeinit_submariner"
+        name: kubeinit.kubeinit.kubeinit_submariner
         tasks_from: 30_subctl_verify.yml
         public: true
diff --git a/kubeinit/playbooks/submariner.yml b/kubeinit/playbooks/submariner.yml
index bc312f125..18da872d0 100644
--- a/kubeinit/playbooks/submariner.yml
+++ b/kubeinit/playbooks/submariner.yml
@@ -29,7 +29,7 @@
   tasks:
     - name: Run the prepare tasks
       ansible.builtin.include_role:
-        name: "../../roles/kubeinit_prepare"
+        name: kubeinit.kubeinit.kubeinit_prepare
         public: true
 
 - name: Main playbook to deploy submariner
@@ -38,5 +38,5 @@
   tasks:
     - name: Deploy submariner
       ansible.builtin.import_role:
-        name: "../../roles/kubeinit_submariner"
+        name: kubeinit.kubeinit.kubeinit_submariner
         public: true
diff --git a/kubeinit/roles/kubeinit_apache/tasks/main.yml b/kubeinit/roles/kubeinit_apache/tasks/main.yml
index 58c5c21b5..82047a660 100644
--- a/kubeinit/roles/kubeinit_apache/tasks/main.yml
+++ b/kubeinit/roles/kubeinit_apache/tasks/main.yml
@@ -56,7 +56,7 @@
 
 - name: Create systemd service for podman container
   ansible.builtin.include_role:
-    name: "../../roles/kubeinit_services"
+    name: kubeinit.kubeinit.kubeinit_services
     tasks_from: create_managed_service.yml
     public: true
   vars:
diff --git a/kubeinit/roles/kubeinit_bind/tasks/main.yml b/kubeinit/roles/kubeinit_bind/tasks/main.yml
index a20be2e1e..7d378e720 100644
--- a/kubeinit/roles/kubeinit_bind/tasks/main.yml
+++ b/kubeinit/roles/kubeinit_bind/tasks/main.yml
@@ -112,7 +112,7 @@
 
 - name: Create systemd service for podman container
   ansible.builtin.include_role:
-    name: "../../roles/kubeinit_services"
+    name: kubeinit.kubeinit.kubeinit_services
     tasks_from: create_managed_service.yml
     public: true
   vars:
diff --git a/kubeinit/roles/kubeinit_cdk/tasks/main.yml b/kubeinit/roles/kubeinit_cdk/tasks/main.yml
index a7179b990..efb246daf 100644
--- a/kubeinit/roles/kubeinit_cdk/tasks/main.yml
+++ b/kubeinit/roles/kubeinit_cdk/tasks/main.yml
@@ -16,7 +16,7 @@
 
 - name: Prepare services if needed
   ansible.builtin.include_role:
-    name: "../../roles/kubeinit_services"
+    name: kubeinit.kubeinit.kubeinit_services
     tasks_from: prepare_services.yml
     public: true
   vars:
@@ -32,7 +32,7 @@
 
 - name: Deploy the cluster nodes
   ansible.builtin.include_role:
-    name: "../../roles/kubeinit_libvirt"
+    name: kubeinit.kubeinit.kubeinit_libvirt
     tasks_from: deploy_ubuntu_guest.yml
     public: yes
   loop: "{{ groups['all_cluster_nodes'] + groups['extra_nodes'] }}"
diff --git a/kubeinit/roles/kubeinit_cdk/tasks/post_configure_guest.yml b/kubeinit/roles/kubeinit_cdk/tasks/post_configure_guest.yml
index 6b5a4abec..0c7b48461 100644
--- a/kubeinit/roles/kubeinit_cdk/tasks/post_configure_guest.yml
+++ b/kubeinit/roles/kubeinit_cdk/tasks/post_configure_guest.yml
@@ -16,7 +16,7 @@
 
 - name: Prepare podman
   ansible.builtin.include_role:
-    name: ../../roles/kubeinit_prepare
+    name: kubeinit.kubeinit.kubeinit_prepare
     tasks_from: prepare_podman.yml
     public: true
 
diff --git a/kubeinit/roles/kubeinit_cdk/tasks/post_deployment_tasks.yml b/kubeinit/roles/kubeinit_cdk/tasks/post_deployment_tasks.yml
index 2b137aaf1..756bd12d6 100644
--- a/kubeinit/roles/kubeinit_cdk/tasks/post_deployment_tasks.yml
+++ b/kubeinit/roles/kubeinit_cdk/tasks/post_deployment_tasks.yml
@@ -20,7 +20,7 @@
 - block:
     - name: Configure NFS
       ansible.builtin.include_role:
-        name: "../../roles/kubeinit_nfs"
+        name: kubeinit.kubeinit.kubeinit_nfs
         public: true
       when: "'nfs' in kubeinit_cluster_hostvars.services"
   vars:
diff --git a/kubeinit/roles/kubeinit_cdk/tasks/prepare_cluster.yml b/kubeinit/roles/kubeinit_cdk/tasks/prepare_cluster.yml
index 8a87d9391..297cf6eaf 100644
--- a/kubeinit/roles/kubeinit_cdk/tasks/prepare_cluster.yml
+++ b/kubeinit/roles/kubeinit_cdk/tasks/prepare_cluster.yml
@@ -16,7 +16,7 @@
 
 - name: Prepare environment if not prepared
   ansible.builtin.include_role:
-    name: "../../roles/kubeinit_prepare"
+    name: kubeinit.kubeinit.kubeinit_prepare
     public: true
   vars:
     environment_facts_set: "{{ kubeinit_cluster_facts_name is defined }}"
@@ -31,7 +31,7 @@
 
 - name: Setup the cluster provision container
   ansible.builtin.include_role:
-    name: "../../roles/kubeinit_services"
+    name: kubeinit.kubeinit.kubeinit_services
     tasks_from: create_provision_container.yml
   vars:
     kubeinit_deployment_node_name: "{{ kubeinit_provision_service_node }}"
diff --git a/kubeinit/roles/kubeinit_dnsmasq/tasks/main.yml b/kubeinit/roles/kubeinit_dnsmasq/tasks/main.yml
index 47f68f35f..80362dc66 100644
--- a/kubeinit/roles/kubeinit_dnsmasq/tasks/main.yml
+++ b/kubeinit/roles/kubeinit_dnsmasq/tasks/main.yml
@@ -88,7 +88,7 @@
 
 - name: Create systemd service for podman container
   ansible.builtin.include_role:
-    name: "../../roles/kubeinit_services"
+    name: kubeinit.kubeinit.kubeinit_services
     tasks_from: create_managed_service.yml
     public: true
   vars:
diff --git a/kubeinit/roles/kubeinit_eks/tasks/main.yml b/kubeinit/roles/kubeinit_eks/tasks/main.yml
index d16d8780e..88e5558c9 100644
--- a/kubeinit/roles/kubeinit_eks/tasks/main.yml
+++ b/kubeinit/roles/kubeinit_eks/tasks/main.yml
@@ -16,7 +16,7 @@
 
 - name: Prepare services if needed
   ansible.builtin.include_role:
-    name: "../../roles/kubeinit_services"
+    name: kubeinit.kubeinit.kubeinit_services
     tasks_from: prepare_services.yml
     public: true
   vars:
@@ -32,7 +32,7 @@
 
 - name: Deploy the cluster nodes
   ansible.builtin.include_role:
-    name: "../../roles/kubeinit_libvirt"
+    name: kubeinit.kubeinit.kubeinit_libvirt
     tasks_from: deploy_centos_guest.yml
     public: yes
   loop: "{{ groups['all_cluster_nodes'] }}"
diff --git a/kubeinit/roles/kubeinit_eks/tasks/post_deployment_tasks.yml b/kubeinit/roles/kubeinit_eks/tasks/post_deployment_tasks.yml
index 74b971447..1eb3ce181 100644
--- a/kubeinit/roles/kubeinit_eks/tasks/post_deployment_tasks.yml
+++ b/kubeinit/roles/kubeinit_eks/tasks/post_deployment_tasks.yml
@@ -61,7 +61,7 @@
 - block:
     - name: Configure NFS
       ansible.builtin.include_role:
-        name: "../../roles/kubeinit_nfs"
+        name: kubeinit.kubeinit.kubeinit_nfs
         public: true
       when: "'nfs' in kubeinit_cluster_hostvars.services"
   vars:
diff --git a/kubeinit/roles/kubeinit_eks/tasks/prepare_cluster.yml b/kubeinit/roles/kubeinit_eks/tasks/prepare_cluster.yml
index 966290379..bf17c3fd9 100644
--- a/kubeinit/roles/kubeinit_eks/tasks/prepare_cluster.yml
+++ b/kubeinit/roles/kubeinit_eks/tasks/prepare_cluster.yml
@@ -16,7 +16,7 @@
 
 - name: Prepare environment if not prepared
   ansible.builtin.include_role:
-    name: "../../roles/kubeinit_prepare"
+    name: kubeinit.kubeinit.kubeinit_prepare
     public: true
   vars:
     environment_facts_set: "{{ kubeinit_cluster_facts_name is defined }}"
@@ -31,7 +31,7 @@
 
 - name: Setup the cluster provision container
   ansible.builtin.include_role:
-    name: "../../roles/kubeinit_services"
+    name: kubeinit.kubeinit.kubeinit_services
     tasks_from: create_provision_container.yml
   vars:
     kubeinit_deployment_node_name: "{{ kubeinit_provision_service_node }}"
diff --git a/kubeinit/roles/kubeinit_haproxy/tasks/main.yml b/kubeinit/roles/kubeinit_haproxy/tasks/main.yml
index cf2bba276..9d9ec110e 100644
--- a/kubeinit/roles/kubeinit_haproxy/tasks/main.yml
+++ b/kubeinit/roles/kubeinit_haproxy/tasks/main.yml
@@ -79,7 +79,7 @@
 
 - name: Create systemd service for podman container
   ansible.builtin.include_role:
-    name: "../../roles/kubeinit_services"
+    name: kubeinit.kubeinit.kubeinit_services
     tasks_from: create_managed_service.yml
     public: true
   vars:
diff --git a/kubeinit/roles/kubeinit_k8s/tasks/main.yml b/kubeinit/roles/kubeinit_k8s/tasks/main.yml
index 2e4b4063a..d120302c2 100644
--- a/kubeinit/roles/kubeinit_k8s/tasks/main.yml
+++ b/kubeinit/roles/kubeinit_k8s/tasks/main.yml
@@ -16,7 +16,7 @@
 
 - name: Prepare services if needed
   ansible.builtin.include_role:
-    name: "../../roles/kubeinit_services"
+    name: kubeinit.kubeinit.kubeinit_services
     tasks_from: prepare_services.yml
     public: true
   vars:
@@ -32,7 +32,7 @@
 
 - name: Deploy the cluster nodes
   ansible.builtin.include_role:
-    name: "../../roles/kubeinit_libvirt"
+    name: kubeinit.kubeinit.kubeinit_libvirt
     tasks_from: deploy_centos_guest.yml
     public: yes
   loop: "{{ groups['all_cluster_nodes'] }}"
diff --git a/kubeinit/roles/kubeinit_k8s/tasks/post_deployment_tasks.yml b/kubeinit/roles/kubeinit_k8s/tasks/post_deployment_tasks.yml
index 35d92a4c9..19690ad3c 100644
--- a/kubeinit/roles/kubeinit_k8s/tasks/post_deployment_tasks.yml
+++ b/kubeinit/roles/kubeinit_k8s/tasks/post_deployment_tasks.yml
@@ -41,7 +41,7 @@
 - block:
     - name: Configure NFS
       ansible.builtin.include_role:
-        name: "../../roles/kubeinit_nfs"
+        name: kubeinit.kubeinit.kubeinit_nfs
         public: true
       when: "'nfs' in kubeinit_cluster_hostvars.services"
   vars:
diff --git a/kubeinit/roles/kubeinit_k8s/tasks/prepare_cluster.yml b/kubeinit/roles/kubeinit_k8s/tasks/prepare_cluster.yml
index 915a4d6b9..458f8e37f 100644
--- a/kubeinit/roles/kubeinit_k8s/tasks/prepare_cluster.yml
+++ b/kubeinit/roles/kubeinit_k8s/tasks/prepare_cluster.yml
@@ -16,7 +16,7 @@
 
 - name: Prepare environment if not prepared
   ansible.builtin.include_role:
-    name: "../../roles/kubeinit_prepare"
+    name: kubeinit.kubeinit.kubeinit_prepare
     public: true
   vars:
     environment_facts_set: "{{ kubeinit_cluster_facts_name is defined }}"
@@ -31,7 +31,7 @@
 
 - name: Setup the cluster provision container
   ansible.builtin.include_role:
-    name: "../../roles/kubeinit_services"
+    name: kubeinit.kubeinit.kubeinit_services
     tasks_from: create_provision_container.yml
   vars:
     kubeinit_deployment_node_name: "{{ kubeinit_provision_service_node }}"
diff --git a/kubeinit/roles/kubeinit_kid/tasks/main.yml b/kubeinit/roles/kubeinit_kid/tasks/main.yml
index ca8f5c6c2..a44a61819 100644
--- a/kubeinit/roles/kubeinit_kid/tasks/main.yml
+++ b/kubeinit/roles/kubeinit_kid/tasks/main.yml
@@ -16,7 +16,7 @@
 
 - name: Prepare services if needed
   ansible.builtin.include_role:
-    name: "../../roles/kubeinit_services"
+    name: kubeinit.kubeinit.kubeinit_services
     tasks_from: prepare_services.yml
     public: true
   vars:
@@ -32,7 +32,7 @@
 
 - name: Deploy the cluster nodes
   ansible.builtin.include_role:
-    name: "../../roles/kubeinit_libvirt"
+    name: kubeinit.kubeinit.kubeinit_libvirt
     tasks_from: deploy_debian_guest.yml
     public: yes
   loop: "{{ groups['all_cluster_nodes'] }}"
diff --git a/kubeinit/roles/kubeinit_kid/tasks/post_configure_guest.yml b/kubeinit/roles/kubeinit_kid/tasks/post_configure_guest.yml
index 1ab5ab653..2563a330f 100644
--- a/kubeinit/roles/kubeinit_kid/tasks/post_configure_guest.yml
+++ b/kubeinit/roles/kubeinit_kid/tasks/post_configure_guest.yml
@@ -16,7 +16,7 @@
 
 - name: Prepare podman
   ansible.builtin.include_role:
-    name: ../../roles/kubeinit_prepare
+    name: kubeinit.kubeinit.kubeinit_prepare
     tasks_from: prepare_podman.yml
     public: true
 
diff --git a/kubeinit/roles/kubeinit_kid/tasks/post_deployment_tasks.yml b/kubeinit/roles/kubeinit_kid/tasks/post_deployment_tasks.yml
index 9d67b7bda..846aedb70 100644
--- a/kubeinit/roles/kubeinit_kid/tasks/post_deployment_tasks.yml
+++ b/kubeinit/roles/kubeinit_kid/tasks/post_deployment_tasks.yml
@@ -20,7 +20,7 @@
 - block:
     - name: Configure NFS
       ansible.builtin.include_role:
-        name: "../../roles/kubeinit_nfs"
+        name: kubeinit.kubeinit.kubeinit_nfs
         public: true
       when: "'nfs' in kubeinit_cluster_hostvars.services"
   vars:
diff --git a/kubeinit/roles/kubeinit_kid/tasks/prepare_cluster.yml b/kubeinit/roles/kubeinit_kid/tasks/prepare_cluster.yml
index f6bf81127..4012e8d3c 100644
--- a/kubeinit/roles/kubeinit_kid/tasks/prepare_cluster.yml
+++ b/kubeinit/roles/kubeinit_kid/tasks/prepare_cluster.yml
@@ -16,7 +16,7 @@
 
 - name: Prepare environment if not prepared
   ansible.builtin.include_role:
-    name: "../../roles/kubeinit_prepare"
+    name: kubeinit.kubeinit.kubeinit_prepare
     public: true
   vars:
     environment_facts_set: "{{ kubeinit_cluster_facts_name is defined }}"
@@ -31,7 +31,7 @@
 
 - name: Setup the cluster provision container
   ansible.builtin.include_role:
-    name: "../../roles/kubeinit_services"
+    name: kubeinit.kubeinit.kubeinit_services
     tasks_from: create_provision_container.yml
   vars:
     kubeinit_deployment_node_name: "{{ kubeinit_provision_service_node }}"
diff --git a/kubeinit/roles/kubeinit_libvirt/tasks/deploy_centos_guest.yml b/kubeinit/roles/kubeinit_libvirt/tasks/deploy_centos_guest.yml
index 6d8e6a2d8..2449800e0 100644
--- a/kubeinit/roles/kubeinit_libvirt/tasks/deploy_centos_guest.yml
+++ b/kubeinit/roles/kubeinit_libvirt/tasks/deploy_centos_guest.yml
@@ -19,19 +19,19 @@
 
     - name: Create the network interface template for networking details
       ansible.builtin.template:
-        src: "../../roles/kubeinit_libvirt/templates/ifcfg-eth0.j2"
+        src: "ifcfg-eth0.j2"
         dest: "{{ kubeinit_libvirt_hypervisor_tmp_dir }}/{{ hostvars[kubeinit_deployment_node_name].guest_name }}/ifcfg-eth0"
         mode: "0644"
 
     - name: Create the hosts template
       ansible.builtin.template:
-        src: "../../roles/kubeinit_libvirt/templates/101-cloudinit-hosts.tmpl.j2"
+        src: "101-cloudinit-hosts.tmpl.j2"
         dest: "{{ kubeinit_libvirt_hypervisor_tmp_dir }}/{{ hostvars[kubeinit_deployment_node_name].guest_name }}/hosts.redhat.tmpl"
         mode: "0644"
 
     - name: Create the network cloudinit templates for networking details
       ansible.builtin.template:
-        src: "../../roles/kubeinit_libvirt/templates/102-cloudinit-cloud.cfg.j2"
+        src: "102-cloudinit-cloud.cfg.j2"
         dest: "{{ kubeinit_libvirt_hypervisor_tmp_dir }}/{{ hostvars[kubeinit_deployment_node_name].guest_name }}/cloud.cfg"
         mode: "0644"
 
@@ -191,7 +191,7 @@
 
     - name: Perform any distro-specific post-deployment guest configuration
       ansible.builtin.include_role:
-        name: "../../roles/kubeinit_{{ kubeinit_inventory_cluster_distro }}"
+        name: "kubeinit.kubeinit.kubeinit_{{ kubeinit_inventory_cluster_distro }}"
         tasks_from: post_configure_guest.yml
         public: true
 
@@ -216,6 +216,6 @@
 
 - name: Gather network and host facts for guest
   ansible.builtin.include_role:
-    name: "../../roles/kubeinit_prepare"
+    name: kubeinit.kubeinit.kubeinit_prepare
     tasks_from: gather_host_facts.yml
     public: yes
diff --git a/kubeinit/roles/kubeinit_libvirt/tasks/deploy_debian_guest.yml b/kubeinit/roles/kubeinit_libvirt/tasks/deploy_debian_guest.yml
index e1f942352..3be1b3c33 100644
--- a/kubeinit/roles/kubeinit_libvirt/tasks/deploy_debian_guest.yml
+++ b/kubeinit/roles/kubeinit_libvirt/tasks/deploy_debian_guest.yml
@@ -18,25 +18,25 @@
   block:
     - name: Create the interfaces template for networking details
       ansible.builtin.template:
-        src: "../../roles/kubeinit_libvirt/templates/debian-network-config-enp1s0.j2"
+        src: "debian-network-config-enp1s0.j2"
         dest: "{{ kubeinit_libvirt_hypervisor_tmp_dir }}/{{ hostvars[kubeinit_deployment_node_name].guest_name }}/enp1s0"
         mode: "0644"
 
     - name: Create the hosts template
       ansible.builtin.template:
-        src: "../../roles/kubeinit_libvirt/templates/101-cloudinit-hosts.tmpl.j2"
+        src: "101-cloudinit-hosts.tmpl.j2"
         dest: "{{ kubeinit_libvirt_hypervisor_tmp_dir }}/{{ hostvars[kubeinit_deployment_node_name].guest_name }}/hosts.debian.tmpl"
         mode: "0644"
 
     - name: Create the main config file for cloud-init
       ansible.builtin.template:
-        src: "../../roles/kubeinit_libvirt/templates/102-cloudinit-cloud.cfg.j2"
+        src: "102-cloudinit-cloud.cfg.j2"
         dest: "{{ kubeinit_libvirt_hypervisor_tmp_dir }}/{{ hostvars[kubeinit_deployment_node_name].guest_name }}/cloud.cfg"
         mode: "0644"
 
     - name: Create the datasource cloud-init file
       ansible.builtin.template:
-        src: "../../roles/kubeinit_libvirt/templates/90-cloudinit-dpkg.cfg.j2"
+        src: "90-cloudinit-dpkg.cfg.j2"
         dest: "{{ kubeinit_libvirt_hypervisor_tmp_dir }}/{{ hostvars[kubeinit_deployment_node_name].guest_name }}/90_dpkg.cfg"
         mode: "0644"
 
@@ -225,7 +225,7 @@
 
     - name: Perform any distro-specific post-deployment guest configuration
       ansible.builtin.include_role:
-        name: "../../roles/kubeinit_{{ kubeinit_inventory_cluster_distro }}"
+        name: "kubeinit.kubeinit.kubeinit_{{ kubeinit_inventory_cluster_distro }}"
         tasks_from: post_configure_guest.yml
         public: true
 
@@ -250,6 +250,6 @@
 
 - name: Gather network and host facts for guest
   ansible.builtin.include_role:
-    name: "../../roles/kubeinit_prepare"
+    name: kubeinit.kubeinit.kubeinit_prepare
     tasks_from: gather_host_facts.yml
     public: yes
diff --git a/kubeinit/roles/kubeinit_libvirt/tasks/deploy_ubuntu_guest.yml b/kubeinit/roles/kubeinit_libvirt/tasks/deploy_ubuntu_guest.yml
index 004e7bf04..5a4645f89 100644
--- a/kubeinit/roles/kubeinit_libvirt/tasks/deploy_ubuntu_guest.yml
+++ b/kubeinit/roles/kubeinit_libvirt/tasks/deploy_ubuntu_guest.yml
@@ -18,25 +18,25 @@
   block:
     - name: Create the interfaces template for networking details
       ansible.builtin.template:
-        src: "../../roles/kubeinit_libvirt/templates/00-installer-ubuntu-netconfig.yaml.j2"
+        src: "00-installer-ubuntu-netconfig.yaml.j2"
         dest: "{{ kubeinit_libvirt_hypervisor_tmp_dir }}/{{ hostvars[kubeinit_deployment_node_name].guest_name }}/00-installer-ubuntu-netconfig.yaml"
         mode: "0644"
 
     - name: Create the hosts template
       ansible.builtin.template:
-        src: "../../roles/kubeinit_libvirt/templates/101-cloudinit-hosts.tmpl.j2"
+        src: "101-cloudinit-hosts.tmpl.j2"
         dest: "{{ kubeinit_libvirt_hypervisor_tmp_dir }}/{{ hostvars[kubeinit_deployment_node_name].guest_name }}/hosts.debian.tmpl"
         mode: "0644"
 
     - name: Create the main config file for cloud-init
       ansible.builtin.template:
-        src: "../../roles/kubeinit_libvirt/templates/102-cloudinit-cloud.cfg.j2"
+        src: "102-cloudinit-cloud.cfg.j2"
         dest: "{{ kubeinit_libvirt_hypervisor_tmp_dir }}/{{ hostvars[kubeinit_deployment_node_name].guest_name }}/cloud.cfg"
         mode: "0644"
 
     - name: Create the datasource cloud-init file
       ansible.builtin.template:
-        src: "../../roles/kubeinit_libvirt/templates/90-cloudinit-dpkg.cfg.j2"
+        src: "90-cloudinit-dpkg.cfg.j2"
         dest: "{{ kubeinit_libvirt_hypervisor_tmp_dir }}/{{ hostvars[kubeinit_deployment_node_name].guest_name }}/90_dpkg.cfg"
         mode: "0644"
 
@@ -235,7 +235,7 @@
 
     - name: Perform any distro-specific post-deployment guest configuration
       ansible.builtin.include_role:
-        name: "../../roles/kubeinit_{{ kubeinit_inventory_cluster_distro }}"
+        name: "kubeinit.kubeinit.kubeinit_{{ kubeinit_inventory_cluster_distro }}"
         tasks_from: post_configure_guest.yml
         public: true
 
@@ -260,6 +260,6 @@
 
 - name: Gather network and host facts for guest
   ansible.builtin.include_role:
-    name: "../../roles/kubeinit_prepare"
+    name: kubeinit.kubeinit.kubeinit_prepare
     tasks_from: gather_host_facts.yml
     public: yes
diff --git a/kubeinit/roles/kubeinit_libvirt/tasks/download_cloud_images.yml b/kubeinit/roles/kubeinit_libvirt/tasks/download_cloud_images.yml
index 9f5aab616..8d8796e1f 100644
--- a/kubeinit/roles/kubeinit_libvirt/tasks/download_cloud_images.yml
+++ b/kubeinit/roles/kubeinit_libvirt/tasks/download_cloud_images.yml
@@ -16,7 +16,7 @@
 
 - name: Prepare environment if not prepared
   ansible.builtin.include_role:
-    name: "../../roles/kubeinit_prepare"
+    name: kubeinit.kubeinit.kubeinit_prepare
     public: true
   vars:
     task_completed: "{{ hostvars['kubeinit-facts'] is defined }}"
diff --git a/kubeinit/roles/kubeinit_nexus/tasks/main.yml b/kubeinit/roles/kubeinit_nexus/tasks/main.yml
index 50acffa13..130eb5e86 100644
--- a/kubeinit/roles/kubeinit_nexus/tasks/main.yml
+++ b/kubeinit/roles/kubeinit_nexus/tasks/main.yml
@@ -157,7 +157,7 @@
 
 - name: Create systemd service for podman container
   ansible.builtin.include_role:
-    name: "../../roles/kubeinit_services"
+    name: kubeinit.kubeinit.kubeinit_services
     tasks_from: create_managed_service.yml
     public: true
   vars:
diff --git a/kubeinit/roles/kubeinit_okd/tasks/main.yml b/kubeinit/roles/kubeinit_okd/tasks/main.yml
index d86c2550a..6ef9a41b6 100644
--- a/kubeinit/roles/kubeinit_okd/tasks/main.yml
+++ b/kubeinit/roles/kubeinit_okd/tasks/main.yml
@@ -16,7 +16,7 @@
 
 - name: Prepare services if needed
   ansible.builtin.include_role:
-    name: "../../roles/kubeinit_services"
+    name: kubeinit.kubeinit.kubeinit_services
     tasks_from: prepare_services.yml
     public: true
   vars:
@@ -32,7 +32,7 @@
 
 - name: Deploy the cluster bootstrap node
   ansible.builtin.include_role:
-    name: "../../roles/kubeinit_libvirt"
+    name: kubeinit.kubeinit.kubeinit_libvirt
     tasks_from: deploy_coreos_guest.yml
     public: yes
   with_items:
@@ -46,7 +46,7 @@
 
 - name: Deploy the cluster master nodes
   ansible.builtin.include_role:
-    name: "../../roles/kubeinit_libvirt"
+    name: kubeinit.kubeinit.kubeinit_libvirt
     tasks_from: deploy_coreos_guest.yml
     public: yes
   with_items:
@@ -163,7 +163,7 @@
 
 - name: Deploy the cluster worker nodes
   ansible.builtin.include_role:
-    name: "../../roles/kubeinit_libvirt"
+    name: kubeinit.kubeinit.kubeinit_libvirt
     tasks_from: deploy_coreos_guest.yml
     public: yes
   with_items:
diff --git a/kubeinit/roles/kubeinit_okd/tasks/post_deployment_tasks.yml b/kubeinit/roles/kubeinit_okd/tasks/post_deployment_tasks.yml
index f405403f3..17f9f99e0 100644
--- a/kubeinit/roles/kubeinit_okd/tasks/post_deployment_tasks.yml
+++ b/kubeinit/roles/kubeinit_okd/tasks/post_deployment_tasks.yml
@@ -71,7 +71,7 @@
     #
     - name: Configure NFS
       ansible.builtin.include_role:
-        name: "../../roles/kubeinit_nfs"
+        name: kubeinit.kubeinit.kubeinit_nfs
         public: true
       when: "'nfs' in kubeinit_cluster_hostvars.services"
 
@@ -91,7 +91,7 @@
 
     - name: Deploy KubeVirt
       ansible.builtin.include_role:
-        name: "../../roles/kubeinit_kubevirt"
+        name: kubeinit.kubeinit.kubeinit_kubevirt
         tasks_from: main.yml
         public: yes
       when: not kubeinit_okd_openshift_deploy | default(False)
diff --git a/kubeinit/roles/kubeinit_okd/tasks/prepare_cluster.yml b/kubeinit/roles/kubeinit_okd/tasks/prepare_cluster.yml
index be8e4e790..1607eafd1 100644
--- a/kubeinit/roles/kubeinit_okd/tasks/prepare_cluster.yml
+++ b/kubeinit/roles/kubeinit_okd/tasks/prepare_cluster.yml
@@ -16,7 +16,7 @@
 
 - name: Prepare environment if not prepared
   ansible.builtin.include_role:
-    name: "../../roles/kubeinit_prepare"
+    name: kubeinit.kubeinit.kubeinit_prepare
     public: true
   vars:
     environment_facts_set: "{{ kubeinit_cluster_facts_name is defined }}"
@@ -102,7 +102,7 @@
 
 - name: Setup the cluster provision container
   ansible.builtin.include_role:
-    name: "../../roles/kubeinit_services"
+    name: kubeinit.kubeinit.kubeinit_services
     tasks_from: create_provision_container.yml
   vars:
     kubeinit_deployment_node_name: "{{ kubeinit_provision_service_node }}"
@@ -231,7 +231,7 @@
 
 - name: Download CoreOS libvirt images
   ansible.builtin.include_role:
-    name: ../../roles/kubeinit_libvirt
+    name: kubeinit.kubeinit.kubeinit_libvirt
     tasks_from: download_coreos_libvirt_images.yml
     public: true
   with_items:
@@ -253,7 +253,7 @@
 
     - name: Download CoreOS provision images
       ansible.builtin.include_role:
-        name: ../../roles/kubeinit_libvirt
+        name: kubeinit.kubeinit.kubeinit_libvirt
         tasks_from: download_coreos_provision_images.yml
         public: true
 
diff --git a/kubeinit/roles/kubeinit_prepare/tasks/cleanup_hypervisors.yml b/kubeinit/roles/kubeinit_prepare/tasks/cleanup_hypervisors.yml
index e2a412516..f3cbe79d9 100644
--- a/kubeinit/roles/kubeinit_prepare/tasks/cleanup_hypervisors.yml
+++ b/kubeinit/roles/kubeinit_prepare/tasks/cleanup_hypervisors.yml
@@ -21,7 +21,7 @@
 
 - name: Prepare environment if needed
   ansible.builtin.include_role:
-    name: "../../roles/kubeinit_prepare"
+    name: kubeinit.kubeinit.kubeinit_prepare
     public: true
   vars:
     task_completed: "{{ hostvars['kubeinit-facts'] is defined }}"
@@ -343,13 +343,13 @@
 
 - name: Clean the OVN network
   ansible.builtin.include_role:
-    name: "../../roles/kubeinit_libvirt"
+    name: kubeinit.kubeinit.kubeinit_libvirt
     tasks_from: 10_ovn_cleanup.yml
     public: true
 
 - name: Clean up the libvirt networks and hosts before validations
   ansible.builtin.include_role:
-    name: "../../roles/kubeinit_libvirt"
+    name: kubeinit.kubeinit.kubeinit_libvirt
     tasks_from: 10_cleanup.yml
     public: true
 
diff --git a/kubeinit/roles/kubeinit_prepare/tasks/prepare_hypervisor.yml b/kubeinit/roles/kubeinit_prepare/tasks/prepare_hypervisor.yml
index 62427d554..d0634a8be 100644
--- a/kubeinit/roles/kubeinit_prepare/tasks/prepare_hypervisor.yml
+++ b/kubeinit/roles/kubeinit_prepare/tasks/prepare_hypervisor.yml
@@ -30,7 +30,7 @@
   block:
     - name: Provision the libvirt services on the hypervisor
       ansible.builtin.include_role:
-        name: "../../roles/kubeinit_libvirt"
+        name: kubeinit.kubeinit.kubeinit_libvirt
         public: true
   vars:
     kubeinit_deployment_node_name: "{{ inventory_hostname }}"
diff --git a/kubeinit/roles/kubeinit_registry/tasks/main.yml b/kubeinit/roles/kubeinit_registry/tasks/main.yml
index abaf7466c..62a8ac04a 100644
--- a/kubeinit/roles/kubeinit_registry/tasks/main.yml
+++ b/kubeinit/roles/kubeinit_registry/tasks/main.yml
@@ -71,7 +71,7 @@
 
 - name: Create systemd service for podman container
   ansible.builtin.include_role:
-    name: "../../roles/kubeinit_services"
+    name: kubeinit.kubeinit.kubeinit_services
     tasks_from: create_managed_service.yml
     public: true
   vars:
diff --git a/kubeinit/roles/kubeinit_rke/tasks/main.yml b/kubeinit/roles/kubeinit_rke/tasks/main.yml
index 61e3522ec..5854befc8 100644
--- a/kubeinit/roles/kubeinit_rke/tasks/main.yml
+++ b/kubeinit/roles/kubeinit_rke/tasks/main.yml
@@ -16,7 +16,7 @@
 
 - name: Prepare services if needed
   ansible.builtin.include_role:
-    name: "../../roles/kubeinit_services"
+    name: kubeinit.kubeinit.kubeinit_services
     tasks_from: prepare_services.yml
     public: true
   vars:
@@ -32,7 +32,7 @@
 
 - name: Deploy the cluster nodes
   ansible.builtin.include_role:
-    name: "../../roles/kubeinit_libvirt"
+    name: kubeinit.kubeinit.kubeinit_libvirt
     tasks_from: deploy_ubuntu_guest.yml
     public: yes
   loop: "{{ groups['all_cluster_nodes'] }}"
diff --git a/kubeinit/roles/kubeinit_rke/tasks/post_configure_guest.yml b/kubeinit/roles/kubeinit_rke/tasks/post_configure_guest.yml
index 41805a475..9500a8e57 100644
--- a/kubeinit/roles/kubeinit_rke/tasks/post_configure_guest.yml
+++ b/kubeinit/roles/kubeinit_rke/tasks/post_configure_guest.yml
@@ -16,7 +16,7 @@
 
 - name: Prepare podman
   ansible.builtin.include_role:
-    name: ../../roles/kubeinit_prepare
+    name: kubeinit.kubeinit.kubeinit_prepare
     tasks_from: prepare_podman.yml
     public: true
 
diff --git a/kubeinit/roles/kubeinit_rke/tasks/post_deployment_tasks.yml b/kubeinit/roles/kubeinit_rke/tasks/post_deployment_tasks.yml
index 9d67b7bda..846aedb70 100644
--- a/kubeinit/roles/kubeinit_rke/tasks/post_deployment_tasks.yml
+++ b/kubeinit/roles/kubeinit_rke/tasks/post_deployment_tasks.yml
@@ -20,7 +20,7 @@
 - block:
     - name: Configure NFS
       ansible.builtin.include_role:
-        name: "../../roles/kubeinit_nfs"
+        name: kubeinit.kubeinit.kubeinit_nfs
         public: true
       when: "'nfs' in kubeinit_cluster_hostvars.services"
   vars:
diff --git a/kubeinit/roles/kubeinit_rke/tasks/prepare_cluster.yml b/kubeinit/roles/kubeinit_rke/tasks/prepare_cluster.yml
index ae9de3435..93173371b 100644
--- a/kubeinit/roles/kubeinit_rke/tasks/prepare_cluster.yml
+++ b/kubeinit/roles/kubeinit_rke/tasks/prepare_cluster.yml
@@ -16,7 +16,7 @@
 
 - name: Prepare environment if not prepared
   ansible.builtin.include_role:
-    name: "../../roles/kubeinit_prepare"
+    name: kubeinit.kubeinit.kubeinit_prepare
     public: true
   vars:
     environment_facts_set: "{{ kubeinit_cluster_facts_name is defined }}"
@@ -31,7 +31,7 @@
 
 - name: Setup the cluster provision container
   ansible.builtin.include_role:
-    name: "../../roles/kubeinit_services"
+    name: kubeinit.kubeinit.kubeinit_services
     tasks_from: create_provision_container.yml
   vars:
     kubeinit_deployment_node_name: "{{ kubeinit_provision_service_node }}"
diff --git a/kubeinit/roles/kubeinit_services/tasks/00_create_service_pod.yml b/kubeinit/roles/kubeinit_services/tasks/00_create_service_pod.yml
index a6dabbb1a..65b554864 100644
--- a/kubeinit/roles/kubeinit_services/tasks/00_create_service_pod.yml
+++ b/kubeinit/roles/kubeinit_services/tasks/00_create_service_pod.yml
@@ -20,7 +20,7 @@
 
     - name: Prepare podman
       ansible.builtin.include_role:
-        name: ../../roles/kubeinit_prepare
+        name: kubeinit.kubeinit.kubeinit_prepare
         tasks_from: prepare_podman.yml
         public: true
 
diff --git a/kubeinit/roles/kubeinit_services/tasks/create_network.yml b/kubeinit/roles/kubeinit_services/tasks/create_network.yml
index bdc2dba94..28feaf3de 100644
--- a/kubeinit/roles/kubeinit_services/tasks/create_network.yml
+++ b/kubeinit/roles/kubeinit_services/tasks/create_network.yml
@@ -21,7 +21,7 @@
 
 - name: Cleanup hypervisors if needed
   ansible.builtin.include_role:
-    name: "../../roles/kubeinit_prepare"
+    name: kubeinit.kubeinit.kubeinit_prepare
     tasks_from: cleanup_hypervisors.yml
     public: true
   vars:
@@ -37,7 +37,7 @@
 
 - name: Create OVN network
   ansible.builtin.include_role:
-    name: "../../roles/kubeinit_libvirt"
+    name: kubeinit.kubeinit.kubeinit_libvirt
     tasks_from: deploy_network.yml
     public: true
 
diff --git a/kubeinit/roles/kubeinit_services/tasks/create_provision_container.yml b/kubeinit/roles/kubeinit_services/tasks/create_provision_container.yml
index ea48d9e3f..3fd313450 100644
--- a/kubeinit/roles/kubeinit_services/tasks/create_provision_container.yml
+++ b/kubeinit/roles/kubeinit_services/tasks/create_provision_container.yml
@@ -134,7 +134,7 @@
 
     - name: Create systemd service for podman container
       ansible.builtin.include_role:
-        name: "../../roles/kubeinit_services"
+        name: kubeinit.kubeinit.kubeinit_services
         tasks_from: create_managed_service.yml
         public: true
       vars:
@@ -379,6 +379,6 @@
 
 - name: Gather network and host facts for guest
   ansible.builtin.include_role:
-    name: "../../roles/kubeinit_prepare"
+    name: kubeinit.kubeinit.kubeinit_prepare
     tasks_from: gather_host_facts.yml
     public: yes
diff --git a/kubeinit/roles/kubeinit_services/tasks/main.yml b/kubeinit/roles/kubeinit_services/tasks/main.yml
index 8b6d0fa3b..808efd6c6 100644
--- a/kubeinit/roles/kubeinit_services/tasks/main.yml
+++ b/kubeinit/roles/kubeinit_services/tasks/main.yml
@@ -33,7 +33,7 @@
 
 - name: Setup the services pod
   ansible.builtin.include_role:
-    name: ../../roles/kubeinit_services
+    name: kubeinit.kubeinit.kubeinit_services
     tasks_from: 00_create_service_pod.yml
     public: true
   with_items:
@@ -59,7 +59,7 @@
 
 - name: Start services containers
   ansible.builtin.include_role:
-    name: ../../roles/kubeinit_services
+    name: kubeinit.kubeinit.kubeinit_services
     tasks_from: start_services_containers.yml
     public: true
   with_items:
diff --git a/kubeinit/roles/kubeinit_services/tasks/prepare_services.yml b/kubeinit/roles/kubeinit_services/tasks/prepare_services.yml
index 88b684b89..41e631c27 100644
--- a/kubeinit/roles/kubeinit_services/tasks/prepare_services.yml
+++ b/kubeinit/roles/kubeinit_services/tasks/prepare_services.yml
@@ -16,7 +16,7 @@
 
 - name: Prepare environment if needed
   ansible.builtin.include_role:
-    name: "../../roles/kubeinit_prepare"
+    name: kubeinit.kubeinit.kubeinit_prepare
     public: true
   vars:
     task_completed: "{{ hostvars['kubeinit-facts'] is defined }}"
@@ -57,7 +57,7 @@
 
 - name: Gather network and host facts for guest
   ansible.builtin.include_role:
-    name: "../../roles/kubeinit_prepare"
+    name: kubeinit.kubeinit.kubeinit_prepare
     tasks_from: gather_host_facts.yml
     public: yes
   vars:
diff --git a/kubeinit/roles/kubeinit_services/tasks/start_services_containers.yml b/kubeinit/roles/kubeinit_services/tasks/start_services_containers.yml
index dd7b449b7..b7aea4086 100644
--- a/kubeinit/roles/kubeinit_services/tasks/start_services_containers.yml
+++ b/kubeinit/roles/kubeinit_services/tasks/start_services_containers.yml
@@ -23,7 +23,7 @@
     #
     - name: Configure Bind
       ansible.builtin.include_role:
-        name: "../../roles/kubeinit_bind"
+        name: kubeinit.kubeinit.kubeinit_bind
         public: true
       when: "'bind' in hostvars[kubeinit_deployment_node_name].services"
 
@@ -32,7 +32,7 @@
     #
     - name: Configure Dnsmasq
       ansible.builtin.include_role:
-        name: "../../roles/kubeinit_dnsmasq"
+        name: kubeinit.kubeinit.kubeinit_dnsmasq
         public: true
       when: "'dnsmasq' in hostvars[kubeinit_deployment_node_name].services"
 
@@ -41,7 +41,7 @@
     #
     - name: Configure HAProxy
       ansible.builtin.include_role:
-        name: "../../roles/kubeinit_haproxy"
+        name: kubeinit.kubeinit.kubeinit_haproxy
         public: true
       when: "'haproxy' in hostvars[kubeinit_deployment_node_name].services"
 
@@ -50,7 +50,7 @@
     #
     - name: Configure Nexus
       ansible.builtin.include_role:
-        name: "../../roles/kubeinit_nexus"
+        name: kubeinit.kubeinit.kubeinit_nexus
         public: true
       when: "'nexus' in hostvars[kubeinit_deployment_node_name].services"
 
@@ -59,7 +59,7 @@
     #
     - name: Configure Apache
       ansible.builtin.include_role:
-        name: "../../roles/kubeinit_apache"
+        name: kubeinit.kubeinit.kubeinit_apache
         public: true
       when: "'apache' in hostvars[kubeinit_deployment_node_name].services"
 
@@ -68,7 +68,7 @@
     #
     - name: Configure a local container image registry
       ansible.builtin.include_role:
-        name: "../../roles/kubeinit_registry"
+        name: kubeinit.kubeinit.kubeinit_registry
         public: true
       when: "'registry' in hostvars[kubeinit_deployment_node_name].services"
 
diff --git a/kubeinit/roles/kubeinit_validations/tasks/main.yml b/kubeinit/roles/kubeinit_validations/tasks/main.yml
index 4814995dc..eaf4cde2b 100644
--- a/kubeinit/roles/kubeinit_validations/tasks/main.yml
+++ b/kubeinit/roles/kubeinit_validations/tasks/main.yml
@@ -21,7 +21,7 @@
 
 - name: Cleanup hypervisors if needed
   ansible.builtin.include_role:
-    name: "../../roles/kubeinit_prepare"
+    name: kubeinit.kubeinit.kubeinit_prepare
     tasks_from: cleanup_hypervisors.yml
     public: true
   vars: