diff --git a/handlers/main.yml b/handlers/main.yml
index 7961bb8..ffc18e7 100644
--- a/handlers/main.yml
+++ b/handlers/main.yml
@@ -52,8 +52,3 @@
 - name: Reload systemd-daemon
   systemd:
     daemon_reload: true
-
-- name: Remove generated apt keys
-  file:
-    path: /root/repo.keys
-    state: absent
diff --git a/tasks/nspawn_cache.yml b/tasks/nspawn_cache.yml
index 081c0c5..326c999 100644
--- a/tasks/nspawn_cache.yml
+++ b/tasks/nspawn_cache.yml
@@ -66,21 +66,6 @@
   when:
     - nspawn_image_cache_refresh | bool
 
-- block:
-    - name: Generate apt keys from host for the container cache
-      command: "apt-key exportall"
-      changed_when: false
-      register: _apt_exportall
-
-    - name: Write exported keys to file
-      copy:
-        content: "{{ _apt_exportall.stdout }}"
-        dest: "/var/lib/machines/{{ nspawn_container_base_name }}/root/repo.keys"
-      notify:
-        - Remove generated apt keys
-  when:
-    - ansible_pkg_mgr == 'apt'
-
 - name: Cached image preparation script
   template:
     src: "prep-scripts/nspawn_{{ nspawn_cache_map.distro }}_prep.sh.j2"
diff --git a/templates/prep-scripts/nspawn_ubuntu_prep.sh.j2 b/templates/prep-scripts/nspawn_ubuntu_prep.sh.j2
index 31b5f27..5f88652 100644
--- a/templates/prep-scripts/nspawn_ubuntu_prep.sh.j2
+++ b/templates/prep-scripts/nspawn_ubuntu_prep.sh.j2
@@ -30,14 +30,6 @@ apt-get update
 
 apt-get install -y -o Dpkg::Options::="--force-confdef" -o Dpkg::Options::="--force-confold" --force-yes {{ nspawn_container_distro_required_packages | join(' ') }}
 
-#start gpg-agent if is is not already running
-<(gpg-agent) || true
-gpg-connect-agent /bye || true
-
-if [[ -f "/root/repo.keys" ]]; then
-  apt-key add /root/repo.keys
-fi
-
 apt-get install -y -o Dpkg::Options::="--force-confdef" -o Dpkg::Options::="--force-confold" --force-yes {{ nspawn_container_distro_packages | join(' ') }}
 apt-get upgrade -y -o Dpkg::Options::="--force-confdef" -o Dpkg::Options::="--force-confold" --force-yes
 apt-get clean
diff --git a/vars/ubuntu-16.04.yml b/vars/ubuntu-16.04.yml
index aa7af89..ea3d608 100644
--- a/vars/ubuntu-16.04.yml
+++ b/vars/ubuntu-16.04.yml
@@ -63,3 +63,4 @@ _nspawn_copy_from_host:
   - /etc/apt/sources.list
   - /etc/apt/apt.conf.d/
   - /etc/apt/preferences.d/
+  - /etc/apt/trusted.gpg.d
diff --git a/vars/ubuntu-18.04.yml b/vars/ubuntu-18.04.yml
index c135b23..d8665e2 100644
--- a/vars/ubuntu-18.04.yml
+++ b/vars/ubuntu-18.04.yml
@@ -63,3 +63,4 @@ _nspawn_copy_from_host:
   - /etc/apt/sources.list
   - /etc/apt/apt.conf.d/
   - /etc/apt/preferences.d/
+  - /etc/apt/trusted.gpg.d