diff --git a/mongodb/tasks/main_jessie.yml b/mongodb/tasks/main_jessie.yml
index db69c7c7..8c13e0e4 100644
--- a/mongodb/tasks/main_jessie.yml
+++ b/mongodb/tasks/main_jessie.yml
@@ -1,15 +1,31 @@
 ---
 
-- name: MongoDB public GPG Key
+- name: Look for legacy apt keyring
+  stat:
+    path: /etc/apt/trusted.gpg
+  register: _trusted_gpg_keyring
+
+- name: MongoDB embedded GPG key is absent
   apt_key:
-    # url: https://www.mongodb.org/static/pgp/server-3.4.asc
-    data: "{{ lookup('file', 'server-3.4.asc') }}"
+    id: "B8612B5D"
+    keyring: /etc/apt/trusted.gpg
+    state: absent
+  when: _trusted_gpg_keyring.stat.exists
+
+- name: Add MongoDB GPG key
+  copy:
+    src: "server-{{mongodb_version}}.asc"
+    dest: "/etc/apt/trusted.gpg.d/mongodb-server-{{mongodb_version}}.asc"
+    force: yes
+    mode: "0644"
+    owner: root
+    group: root
 
 - name: enable APT sources list
   apt_repository:
-    repo: deb http://repo.mongodb.org/apt/debian jessie/mongodb-org/3.4 main
+    repo: "deb http://repo.mongodb.org/apt/debian jessie/mongodb-org/{{mongodb_version}} main"
     state: present
-    filename: mongodb
+    filename: "mongodb-org-{{mongodb_version}}"
     update_cache: yes
 
 - name: Install packages