diff --git a/client/tasks/mozilla.yml b/client/tasks/mozilla.yml
index 1dd2346dc4da04605d2ee67e244347b59c42c7bd..c54327666d566db83e69b9badd85eb13f2ba9039 100644
--- a/client/tasks/mozilla.yml
+++ b/client/tasks/mozilla.yml
@@ -3,7 +3,22 @@
 
 - name: ensure the mozilla apt key is in the keyring
   apt: name=pkg-mozilla-archive-keyring state=present
+  tags:
+    - packages
+    - repo
+    - clean
 
-- name: ensure iceweasel-release repository is used
+- name: ensure iceweasel-release repository is not used anymore
+  apt_repository: repo='deb http://mozilla.debian.net/ jessie-backports iceweasel-release' state=absent
+  tags:
+    - packages
+    - repo
+    - clean
+
+- name: ensure firefox-release repository is used
   apt_repository: repo='deb http://mozilla.debian.net/ jessie-backports firefox-release' state=present
+  tags:
+    - packages
+    - repo
+    - clean