diff --git a/icinga2-ansible-add-hosts/defaults/main.yml b/icinga2-ansible-add-hosts/defaults/main.yml
index ca6e2575626c50a2dae3fa25cb94aaee9309295a..f386f9694ab63d8ef33eefa217d70c511936b77e 100644
--- a/icinga2-ansible-add-hosts/defaults/main.yml
+++ b/icinga2-ansible-add-hosts/defaults/main.yml
@@ -1,7 +1,7 @@
 ---
 # defaults file for icinga2-ansible-add-hosts
 
-icinga2_hosts_dir: "/etc/icinga2/conf.d/"
+icinga2_hosts_dir: "/etc/icinga2/conf.d/hosts"
 host_address: "{{ hostvars[item]['ansible_default_ipv4']['address'] }}"
 host_attributes: "none"
 host_checks: "none"
diff --git a/icinga2-ansible-add-hosts/tasks/main.yml b/icinga2-ansible-add-hosts/tasks/main.yml
index 3c41810f6cc86a8aaec001b402fe827981d77506..d6c9d0ffa12b6f8b562823f6421becdadfb36cb7 100644
--- a/icinga2-ansible-add-hosts/tasks/main.yml
+++ b/icinga2-ansible-add-hosts/tasks/main.yml
@@ -1,4 +1,13 @@
 ---
 # tasks file for icinga2-ansible-add-hosts
 
+- name: create Autogenerated host directory
+  file:
+      path: "{{ icinga2_hosts_dir }}"
+      owner: icinga
+      group: icinga
+      mode: 0755
+      state: directory
+      recurse: yes
+
 - import_tasks: icinga2_add_hosts.yml
diff --git a/icinga2-nrpe-agent/defaults/main.yml b/icinga2-nrpe-agent/defaults/main.yml
index 86ce672848e21bc3ca1a3ef341d275e9ed62cebf..cbc704335d204ba75d6d914ad814948b9cea6e86 100644
--- a/icinga2-nrpe-agent/defaults/main.yml
+++ b/icinga2-nrpe-agent/defaults/main.yml
@@ -24,6 +24,8 @@ nrpe_agent_plugins_x86_64: "/usr/lib64/nagios/plugins"
 
 nrpe_agent_check_mem: "https://raw.githubusercontent.com/zwindler/check_mem_ng/master/check_mem_ng.sh"
 
+ssh_port: 22
+
 # Sample NRPE check commands
 nrpe_check_commands:
   check_load:
diff --git a/icinga2-nrpe-agent/tasks/icinga2_nrpe_agent_Debian.yml b/icinga2-nrpe-agent/tasks/icinga2_nrpe_agent_Debian.yml
index 5605d40dfc577c93dca2fac6640822b080b39263..d91f763032613cf706f66ba286e9082ea7708eb4 100644
--- a/icinga2-nrpe-agent/tasks/icinga2_nrpe_agent_Debian.yml
+++ b/icinga2-nrpe-agent/tasks/icinga2_nrpe_agent_Debian.yml
@@ -1,20 +1,22 @@
 ---
 - name: Install Nrpe and Plugins
-  apt: pkg={{ item }} 
-       state=latest
-       update_cache=yes
-       install_recommends=no
+  package:
+       name: "{{ item }}"
+       state: latest
+       update_cache: yes
+       install_recommends: no
   with_items: "{{ nrpe_agent_Debian }}"
   tags:
    - nrpe_agent_install
 
 - name: Copy Nrpe Configuration
-  template: src=nrpe.cfg.j2
-            dest={{ nrpe_agent_config }}
-            owner=root
-            group=root
-            mode=0644
-            backup=yes
+  template:
+    src: nrpe.cfg.j2
+    dest: "{{ nrpe_agent_config }}"
+    owner: root
+    group: root
+    mode: 0644
+    backup: yes
   notify:
    - restart nagios-nrpe-server
   tags:
diff --git a/icinga2-nrpe-agent/tasks/main.yml b/icinga2-nrpe-agent/tasks/main.yml
index 45ab161e226b5da44f8bcb71f44dc317e9f8b546..b70bbda6a631610740b7921de904e05a281dedf8 100644
--- a/icinga2-nrpe-agent/tasks/main.yml
+++ b/icinga2-nrpe-agent/tasks/main.yml
@@ -1,6 +1,10 @@
 ---
 # tasks file for icinga2-nrpe-agent
 
+- set_fact:
+    allowed_hosts: "{{ hostvars[item]['ansible_default_ipv4']['address'] }}"
+  with_inventory_hostnames: monitoring_servers
+
 - include_tasks: icinga2_nrpe_agent_RedHat.yml
   when: ansible_os_family == 'RedHat' and 'monitoring_servers' not in group_names
   # NRPE Agent will be installed on clients only
diff --git a/icinga2-nrpe-agent/templates/nrpe.cfg.j2 b/icinga2-nrpe-agent/templates/nrpe.cfg.j2
index dcfc6d3a93a83356839ec34c31c00f95cc707856..7cab60b076dc1c0f100071c963c8fbf0433dc47c 100644
--- a/icinga2-nrpe-agent/templates/nrpe.cfg.j2
+++ b/icinga2-nrpe-agent/templates/nrpe.cfg.j2
@@ -1,6 +1,6 @@
 # {{ ansible_managed }}
 
-allowed_hosts={{ nrpe_allowed_hosts }}
+allowed_hosts={{ allowed_hosts | default('nrpe_allowed_hosts') }}
 
 {{ nrpe_configuration }}