diff --git a/library/bootstrap-roles/deb-ubuntu-common/meta/main.yml b/library/bootstrap-roles/deb-ubuntu-common/meta/main.yml
index eb80f885..b626a912 100644
--- a/library/bootstrap-roles/deb-ubuntu-common/meta/main.yml
+++ b/library/bootstrap-roles/deb-ubuntu-common/meta/main.yml
@@ -1,12 +1,7 @@
 ---
 dependencies:
   - role: '../../library/roles/ubuntu-deb-general'
-  - { role: '../../library/roles/cloud-init', when:  ansible_product_name == "oVirt Node" }
   - role: '../../library/roles/sshd_config'
-  - src: git+https://gitea-s2i2s.isti.cnr.it/ISTI-ansible-roles/ansible-role-letsencrypt-acme-sh-client.git
-    version: master
-    name: letsencrypt-acme-sh-client
-    state: latest
   - src: git+https://gitea-s2i2s.isti.cnr.it/ISTI-ansible-roles/ansible-role-rsyslog.git
     version: master
     name: rsyslog
@@ -15,6 +10,13 @@ dependencies:
     version: master
     name: linux-firewall
     state: latest
+  - src: git+https://gitea-s2i2s.isti.cnr.it/ISTI-ansible-roles/ansible-role-letsencrypt-acme-sh-client.git
+    version: master
+    name: letsencrypt-acme-sh-client
+    state: latest
+    when: letsencrypt_acme_install is defined and letsencrypt_acme_install
+  - role: '../../library/roles/nagios'
+    when: nagios_enabled is defined and nagios_enabled
   - src: git+https://gitea-s2i2s.isti.cnr.it/ISTI-ansible-roles/ansible-role-zabbix-agent.git
     version: master
     name: zabbix-agent