diff --git a/branding/tasks/main.yml b/branding/tasks/main.yml
index 477bed3fd70c061c68929f10f2581e503185601b..e0e9aa4e662c912b4d97df60f3bf6de19883ed03 100644
--- a/branding/tasks/main.yml
+++ b/branding/tasks/main.yml
@@ -66,6 +66,12 @@
     - branding
     - tls
 
+- name: install gpg to install the apt_key
+  apt: name=gnupg state=present
+  tags:
+    - branding
+    - repos
+
 - name: ensure deployment of apt repository keys
   apt_key:
     data: "{{ lookup('file', item) }}"
diff --git a/texlive/tasks/main.yml b/texlive/tasks/main.yml
index 868635d153b06380fb4baafccb731e0dbbbb42d3..40ef9c9f99bc6cb2b9ab09fe517ee867e7b00522 100644
--- a/texlive/tasks/main.yml
+++ b/texlive/tasks/main.yml
@@ -8,7 +8,6 @@
       - texlive-base
       - texlive-games
       - texlive-humanities
-      - texlive-math-extra
       - texlive-music
       - texlive-pictures
       - texlive-publishers
@@ -59,15 +58,15 @@
     name: fonts-droid
     state: present
     install_recommends: false
-  when: ansible_distribution_release == "jessie"
+  when: debian_version == "jessie"
   tags:
     - texlive
 
-- name: ensure some texlive recommendations are installed for stretch
+- name: ensure some texlive recommendations are installed
   apt:
     name: fonts-droid-fallback
     state: present
     install_recommends: false
-  when: ansible_distribution_release == "stretch"
+  when: debian_version != "jessie"
   tags:
     - texlive