diff --git a/zabbix-agent/meta/main.yml b/zabbix-agent/meta/main.yml
index 4e29b841bcca88f131dde2550fc53dc2e95961ca..d3731907a61b8912aca75fddeccb23eb97b710ec 100644
--- a/zabbix-agent/meta/main.yml
+++ b/zabbix-agent/meta/main.yml
@@ -1,3 +1,3 @@
 ---
 dependencies:
-  - role: zabbix-repo
+  - role: zabbix/zabbix-repo
diff --git a/zabbix-frontend/meta/main.yml b/zabbix-frontend/meta/main.yml
index 76d5cae9bae82a45db794d9ce36e51b22e1e0cb3..d3731907a61b8912aca75fddeccb23eb97b710ec 100644
--- a/zabbix-frontend/meta/main.yml
+++ b/zabbix-frontend/meta/main.yml
@@ -1,6 +1,3 @@
 ---
 dependencies:
-  - role: zabbix-repo
-  - role: webserver
-  - { role: php-fpm, fpm_pool: zabbix, fpm_user: zabbix, fpm_group: zabbix, fpm_socket_user: zabbix, fpm_socket_group: www-data, fpm_params: { date.timezone: "Europe/Berlin", post_max_size: "16M", max_execution_time: 300, max_input_time: 300, always_populate_raw_post_data: -1 } }
-# TODO webserver fails ansible on initial deployment currently by purpose
+  - role: zabbix/zabbix-repo
diff --git a/zabbix-proxy/meta/main.yml b/zabbix-proxy/meta/main.yml
index 4e29b841bcca88f131dde2550fc53dc2e95961ca..d3731907a61b8912aca75fddeccb23eb97b710ec 100644
--- a/zabbix-proxy/meta/main.yml
+++ b/zabbix-proxy/meta/main.yml
@@ -1,3 +1,3 @@
 ---
 dependencies:
-  - role: zabbix-repo
+  - role: zabbix/zabbix-repo
diff --git a/zabbix-server/meta/main.yml b/zabbix-server/meta/main.yml
index 4e29b841bcca88f131dde2550fc53dc2e95961ca..d3731907a61b8912aca75fddeccb23eb97b710ec 100644
--- a/zabbix-server/meta/main.yml
+++ b/zabbix-server/meta/main.yml
@@ -1,3 +1,3 @@
 ---
 dependencies:
-  - role: zabbix-repo
+  - role: zabbix/zabbix-repo