diff --git a/client/tasks/desktop.yml b/client/tasks/desktop.yml
index 13d44b0766bea0af46c29a4f824de519850ba393..e2de7cd42264e6c99ff6d5695effe031dea512a0 100644
--- a/client/tasks/desktop.yml
+++ b/client/tasks/desktop.yml
@@ -84,10 +84,10 @@
 - name: ensure internet applications are installed
   apt: name={{ item }} state=latest
   with_items:
-    - icedove
-    - iceweasel
-    - iceowl-extension
-    - icedove-quotecolors
+    - thunderbird
+    - firefox-esr
+    - lightning
+    - xul-ext-quotecolors
     - enigmail
     - chromium
     - chromium-l10n
diff --git a/client/tasks/mozilla.yml b/client/tasks/mozilla.yml
index c54327666d566db83e69b9badd85eb13f2ba9039..0867fbd807e91bd83a81411c50b59a92448c249a 100644
--- a/client/tasks/mozilla.yml
+++ b/client/tasks/mozilla.yml
@@ -15,8 +15,8 @@
     - repo
     - clean
 
-- name: ensure firefox-release repository is used
-  apt_repository: repo='deb http://mozilla.debian.net/ jessie-backports firefox-release' state=present
+- name: ensure firefox-release repository is not used anymore
+  apt_repository: repo='deb http://mozilla.debian.net/ jessie-backports firefox-release' state=absent
   tags:
     - packages
     - repo