diff --git a/molecule/default/converge.yml b/molecule/default/converge.yml
index 6612754..a058552 100644
--- a/molecule/default/converge.yml
+++ b/molecule/default/converge.yml
@@ -3,16 +3,5 @@
   hosts: all
   vars:
     lemonldap_domain: example.ci
-  pre_tasks:
-    - name: Update apt cache.
-      apt: update_cache=yes cache_valid_time=600
-      when: ansible_os_family == 'Debian'
-      changed_when: false
-    - name: Install GPG
-      apt:
-        name: gpg
-        state: present
-      when: ansible_os_family == 'Debian'
-      changed_when: false
   roles:
     - worteks.lemonldap.install
diff --git a/molecule/default/prepare.yml b/molecule/default/prepare.yml
new file mode 100644
index 0000000..b9769e3
--- /dev/null
+++ b/molecule/default/prepare.yml
@@ -0,0 +1,11 @@
+---
+- name: Prepare
+  hosts: all
+  gather_facts: true
+  tasks:
+    - name: Update apt cache and install gpg
+      apt:
+        name: gpg
+        state: present
+        update_cache: true
+      when: ansible_os_family == 'Debian'