diff --git a/nagios/defaults/main.yml b/nagios/defaults/main.yml
index 5b92f7be..9a7ec645 100644
--- a/nagios/defaults/main.yml
+++ b/nagios/defaults/main.yml
@@ -67,3 +67,5 @@ nagios_dell_omsa_pkgs:
 nagios_dell_standalone_checks:
   - check_dell_warranty.py
   - check_openmanage
+
+nagios_openmanage_additional_opts: ''
diff --git a/ubuntu-deb-general/tasks/packages.yml b/ubuntu-deb-general/tasks/packages.yml
index 85fe4d07..005214a2 100644
--- a/ubuntu-deb-general/tasks/packages.yml
+++ b/ubuntu-deb-general/tasks/packages.yml
@@ -30,30 +30,32 @@
   when: is_debian6
   tags: squeeze-backports
 
-- name: Install the squeeze-lts repository on debian 6
-  apt_repository: repo='deb http://http.debian.net/debian squeeze-lts main contrib non-free' state=present
-  register: update_apt_cache
-  when: is_debian6
-  tags: squeeze-lts
-
 - name: Install the backports repository on debian 7
   apt_repository: repo='deb http://http.debian.net/debian wheezy-backports main' state=present
   register: update_apt_cache
   when: is_debian7
   tags: wheezy-backports
 
-- name: Install the wheezy-lts repository on debian 7
-  apt_repository: repo='deb http://http.debian.net/debian wheezy-lts main contrib non-free' state=present
-  register: update_apt_cache
-  when: is_debian7
-  tags: wheeze-lts
-
 - name: Install the backports repository on debian 8
   apt_repository: repo='deb http://http.debian.net/debian jessie-backports main' state=present
   register: update_apt_cache
   when: is_debian8
   tags: jessie-backports
 
+# Debian 7 “Wheezy” from February 2016 to May 2018
+# Debian 8 “Jessie“ from May 2018 to April/May 2020
+- name: Install the squeeze-lts repository on debian 6
+  apt_repository: repo='deb http://http.debian.net/debian squeeze-lts main contrib non-free' state=present
+  register: update_apt_cache
+  when: is_debian6
+  tags: squeeze-lts
+
+# - name: Install the wheezy-lts repository on debian 7
+#   apt_repository: repo='deb http://http.debian.net/debian wheezy-lts main contrib non-free' state=present
+#   register: update_apt_cache
+#   when: is_debian7
+#   tags: wheeze-lts
+
 - name: apt key for the internal ppa repository
   apt_key: url=http://ppa.research-infrastructures.eu/system/keys/system-archive.asc state=present
   when: is_ubuntu