diff --git a/defaults/main.yml b/defaults/main.yml
index cf9134549ea87e739ee9fbb2b753b69f2be7b4d7..240a016ffd5329f685a87f791c039736f8f8fd4d 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -1,6 +1,8 @@
 ---
-i2_use_repository: true
+i2_manage_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"
 i2_yum_key: "https://packages.icinga.com/icinga.key"
 i2_yum_url: "http://packages.icinga.com/epel/$releasever/release/"
+i2_manage_package: true
+i2_manage_service: true
diff --git a/handlers/main.yml b/handlers/main.yml
index c75198e7d716813453feaacd2aa5dfd2fc34b2bb..ad4745ca7ecb0e4fc2742a11bc1ad03534a3d681 100644
--- a/handlers/main.yml
+++ b/handlers/main.yml
@@ -1,2 +1,9 @@
 ---
-# handlers file for icinga2
+
+- name: start icinga2
+  become: yes
+  service:
+    name: icinga2
+    state: started
+    enabled: yes
+  when: i2_manage_service
diff --git a/meta/main.yml b/meta/main.yml
index 13b73d8001206da736db8c1b71f172690bdb26f5..d0f54af647ea396e575c069987e3e04f16aaa090 100644
--- a/meta/main.yml
+++ b/meta/main.yml
@@ -17,7 +17,7 @@ galaxy_info:
         - 9
     - name: Ubuntu
       versions:
-        - 14.04
+        - 16.04
         - 18.04
   categories:
     - system
diff --git a/tasks/icinga2-Debian.yml b/tasks/icinga2-Debian.yml
index ee68aac9c52d910408a4edac80489836eb4fc97d..f4b45340373b6c7c56b63b6f9faa3edba8ae46ab 100644
--- a/tasks/icinga2-Debian.yml
+++ b/tasks/icinga2-Debian.yml
@@ -2,17 +2,29 @@
 
 - name: Debian - Install apt-transport-https
   become: yes
-  apt: name=apt-transport-https state=present
-  when: i2_use_repository
+  apt:
+    name: apt-transport-https
+    state: present
+  when: i2_manage_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
+  apt_key:
+    url: "{{ i2_apt_key }}"
+    state: present
+  when: i2_manage_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
+  apt_repository:
+    repo: "{{ i2_apt_url }}"
+    state: present
+  when: i2_manage_repository
+
+- name: Debian - Ensure icinga2 is installed
+  become: yes
+  apt:
+    name: icinga2
+    state: present
+  notify: start icinga2
+  when: i2_manage_package
diff --git a/tasks/icinga2-RedHat.yml b/tasks/icinga2-RedHat.yml
index cb734fa0f1b0cd1e2e8d0984f0fb6ae0c03b08a6..19f33d5be13def5d1cedbe141568661e81b47106 100644
--- a/tasks/icinga2-RedHat.yml
+++ b/tasks/icinga2-RedHat.yml
@@ -2,5 +2,18 @@
 
 - name: RedHat - Add Icinga 2 repository
   become: yes
-  template: src=ICINGA-release.repo dest=/etc/yum.repos.d/ICINGA-release.repo
-  when: i2_use_repository
+  yum_repository:
+    name: ICINGA-release
+    description: Icinga packages for EL
+    baseurl: "{{ i2_yum_url }}"
+    gpgkey: "{{ i2_yum_key }}"
+    gpgcheck: yes
+  when: i2_manage_repository
+
+- name: RedHat - Ensure icinga2 is installed
+  become: yes
+  yum:
+    name: icinga2
+    state: present
+  notify: start icinga2
+  when: i2_manage_package
diff --git a/tasks/main.yml b/tasks/main.yml
index beed43f4f04d0f25532e0f8d70f7e4a773b4db02..0c14a8901ffc7ff7c6137a7d7feb99bd39551828 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -3,3 +3,10 @@
   include: icinga2.yml
   tags:
       - install
+
+- name: Make sure Icinga 2 is started
+  service:
+      name: icinga2
+      state: started
+      enabled: yes
+  when: i2_manage_service
diff --git a/templates/ICINGA-release.repo b/templates/ICINGA-release.repo
deleted file mode 100644
index 55cd271fb98d58a1550a842aa1a4594135e932ae..0000000000000000000000000000000000000000
--- a/templates/ICINGA-release.repo
+++ /dev/null
@@ -1,6 +0,0 @@
-[icinga-stable-release]
-name=ICINGA (stable release for epel)
-baseurl={{ i2_yum_url }}
-enabled=1
-gpgcheck=1
-gpgkey={{ i2_yum_key }}
\ No newline at end of file
diff --git a/tests/test.yml b/tests/test.yml
index 07e28fe46deecdfc5eafb3e2583a7bb7f89a433c..f442811157e5ac2a9537b3fd3e2983bd8165ff3c 100644
--- a/tests/test.yml
+++ b/tests/test.yml
@@ -4,5 +4,3 @@
   remote_user: root
   roles:
     - icinga2
-  vars:
-    - i2_use_repository: true