diff --git a/playbooks/groups/bodhi-backend.yml b/playbooks/groups/bodhi-backend.yml
index cc4d07c748..f85bb38d7b 100644
--- a/playbooks/groups/bodhi-backend.yml
+++ b/playbooks/groups/bodhi-backend.yml
@@ -86,8 +86,6 @@
   - bodhi2/backend
 
   - role: zabbix/zabbix-agent
-    zabbix_server: apache
-    zabbix_server_ip: apache
     when: env == "staging"
 
   - role: push-container-registry
diff --git a/roles/zabbix/zabbix-agent/tasks/main.yml b/roles/zabbix/zabbix-agent/tasks/main.yml
index 2e4f28322b..db7b1c06ff 100644
--- a/roles/zabbix/zabbix-agent/tasks/main.yml
+++ b/roles/zabbix/zabbix-agent/tasks/main.yml
@@ -38,6 +38,11 @@
     state: yes
   when: ansible_selinux.status == "enabled"
 
+- name: Ensures config directory
+  file:
+    path: "{{ zabbix_agentd_dir }}"
+    state: directory
+
 - name: Configuring Zabbix agentd
   template:
     src: zabbix_agentd.conf.j2
diff --git a/roles/zabbix/zabbix-agent/vars/Fedora.yml b/roles/zabbix/zabbix-agent/vars/Fedora.yml
index 41f8153b4d..f6af13c5d3 100644
--- a/roles/zabbix/zabbix-agent/vars/Fedora.yml
+++ b/roles/zabbix/zabbix-agent/vars/Fedora.yml
@@ -8,6 +8,6 @@ zabbix_pkgs_list:
   - bc
   - ncurses-compat-libs  # Needed for some megacli tools and raid monitoring checks through zabbix_sender
 
-zabbix_agentd: /etc/zabbix_agentd.conf
+zabbix_agentd: /etc/zabbix/zabbix_agentd.conf
 
-zabbix_agentd_dir: /etc/zabbix/
\ No newline at end of file
+zabbix_agentd_dir: /etc/zabbix/zabbix_agentd.d
\ No newline at end of file