diff --git a/smartgears/fhn_manager/meta/main.yml b/smartgears/fhn_manager/meta/main.yml
index 5a084cae..9b20a211 100644
--- a/smartgears/fhn_manager/meta/main.yml
+++ b/smartgears/fhn_manager/meta/main.yml
@@ -1,4 +1,4 @@
 ---
 dependencies:
-  - role: '../../library/roles/egi/voms'
-  - role: '../../library/roles/egi/occi'
+  - { role: '../../library/roles/egi/voms', when: fhn_manager_install }
+  - { role: '../../library/roles/egi/occi', when: fhn_manager_install }