diff --git a/.gitignore b/.gitignore
index ccf29b4ba3fadf2f18289d0df85c413f46e50c57..8d84aabc1cf5c325339b1aacc79b6653d693e8f7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,4 +4,5 @@
 *.sh
 *.ini
 *.pem
-site.yml
\ No newline at end of file
+site.yml
+tests/test.retry
\ No newline at end of file
diff --git a/defaults/main.yml b/defaults/main.yml
index af4c8b72297180426957dc72c22f1c95adb9afdc..d60a3b24b3de1f6580bc84288b9c54d293228f14 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -1,2 +1,4 @@
 ---
-# defaults file for icinga2
\ No newline at end of file
+i2_use_repository: true
+i2_apt_key: "https://packages.icinga.com/icinga.key"
+i2_apt_url: "deb http://packages.icinga.com/{{ ansible_distribution|lower }} icinga-{{ ansible_distribution_release }} main"
\ No newline at end of file
diff --git a/files/ICINGA-release.repo b/files/ICINGA-release.repo
new file mode 100644
index 0000000000000000000000000000000000000000..86799e40a118f2fb81b06e56db09bff33adf6777
--- /dev/null
+++ b/files/ICINGA-release.repo
@@ -0,0 +1,6 @@
+[icinga-stable-release]
+name=ICINGA (stable release for epel)
+baseurl=http://packages.icinga.com/epel/$releasever/release/
+enabled=1
+gpgcheck=1
+gpgkey=https://packages.icinga.com/icinga.key
\ No newline at end of file
diff --git a/meta/main.yml b/meta/main.yml
index 57ea217e03a2c05d51977fae8827f212be7bf3b7..218e9aa5e9eb60b96bd6bd86cf20d513d5ed5fe5 100644
--- a/meta/main.yml
+++ b/meta/main.yml
@@ -14,6 +14,7 @@ galaxy_info:
     - 8
     - 9
   - name: Ubuntu
+    versions:
     - 14.04
     - 18.04
   categories:
diff --git a/tasks/icinga2-Debian.yml b/tasks/icinga2-Debian.yml
new file mode 100644
index 0000000000000000000000000000000000000000..5bfc91b86ae23660746bc6588cf262b83b1e3534
--- /dev/null
+++ b/tasks/icinga2-Debian.yml
@@ -0,0 +1,18 @@
+---
+
+- name: Debian - Install apt-transport-https
+  become: yes
+  apt: name=apt-transport-https state=present
+  when: i2_use_repository
+
+- name: Debian - Add Icinga 2 repository key
+  become: yes
+  apt_key: url="{{ i2_apt_key }}" state=present
+  when: i2_use_repository and i2_apt_key
+
+- name: Debian - Add Icinga 2 repository
+  become: yes
+  apt_repository: repo={{ item.repo }} state={{ item.state}}
+  with_items:
+    - { repo: "{{ i2_apt_url }}", state: "present" }
+  when: i2_use_repository
\ No newline at end of file
diff --git a/tasks/icinga2-RedHat.yml b/tasks/icinga2-RedHat.yml
new file mode 100644
index 0000000000000000000000000000000000000000..046cc730adb05919da3ba87f002ad43208ec6046
--- /dev/null
+++ b/tasks/icinga2-RedHat.yml
@@ -0,0 +1,6 @@
+---
+
+- name: RedHat - Add Icinga 2 repository
+  become: yes
+  copy: src=ICINGA-release.repo dest=/etc/yum.repos.d/ICINGA-release.repo
+  when: i2_use_repository
\ No newline at end of file
diff --git a/tasks/icinga2.yml b/tasks/icinga2.yml
new file mode 100644
index 0000000000000000000000000000000000000000..ce7161ee4b6dec46f3bff530b7fc987756bed482
--- /dev/null
+++ b/tasks/icinga2.yml
@@ -0,0 +1,9 @@
+---
+
+- name: Include specific Icinga 2
+  include: icinga2-Debian.yml
+  when: ansible_os_family == 'Debian'
+
+- name: Include specific Icinga 2
+  include: icinga2-RedHat.yml
+  when: ansible_os_family == 'RedHat'
\ No newline at end of file
diff --git a/tasks/main.yml b/tasks/main.yml
index d87a6ee0d4be61df5fc77b1dfdf6b04a6895d448..534d3706eb4ef5f9b5c06bd98966390a02ebec0e 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -1,2 +1,5 @@
 ---
-# tasks file for icinga2
\ No newline at end of file
+- name: include icinga2.yml
+  include: icinga2.yml
+  tags:
+      - install
\ No newline at end of file
diff --git a/tests/inventory b/tests/inventory
index 878877b0776c44f55fc4e458f70840f31da5bb01..bcb66f4acb0c0aef78674c80d64880f5f3705f19 100644
--- a/tests/inventory
+++ b/tests/inventory
@@ -1,2 +1,9 @@
-localhost
+[all]
+icinga2
+centos7
 
+[debian]
+icinga2
+
+[rhel]
+centos7
\ No newline at end of file
diff --git a/tests/test.yml b/tests/test.yml
index 788ef8fc6755224daf375dfe4dd64634e1f1ce58..336f4f6243bb827e96fc9c94b4316154ea3ddc35 100644
--- a/tests/test.yml
+++ b/tests/test.yml
@@ -1,5 +1,8 @@
 ---
-- hosts: localhost
+
+- hosts: all
   remote_user: root
   roles:
-    - icinga2
\ No newline at end of file
+    - icinga2
+  vars:
+    - i2_use_repository: true
\ No newline at end of file