diff --git a/shippable.yml b/shippable.yml
index 7895279991..c96795b6b0 100644
--- a/shippable.yml
+++ b/shippable.yml
@@ -56,6 +56,7 @@ matrix:
     - env: T=linux/ubuntu1404/1
     - env: T=linux/ubuntu1604/1
     - env: T=linux/ubuntu1604py3/1
+    - env: T=linux/ubuntu1804/1
 
     - env: T=osx/10.11/2
     - env: T=rhel/7.6/2
@@ -68,6 +69,7 @@ matrix:
     - env: T=linux/ubuntu1404/2
     - env: T=linux/ubuntu1604/2
     - env: T=linux/ubuntu1604py3/2
+    - env: T=linux/ubuntu1804/2
 
     - env: T=osx/10.11/3
     - env: T=rhel/7.6/3
@@ -80,6 +82,7 @@ matrix:
     - env: T=linux/ubuntu1404/3
     - env: T=linux/ubuntu1604/3
     - env: T=linux/ubuntu1604py3/3
+    - env: T=linux/ubuntu1804/3
 
     - env: T=aws/2.7/1
     - env: T=aws/3.6/1
diff --git a/test/integration/targets/git/tasks/gpg-verification.yml b/test/integration/targets/git/tasks/gpg-verification.yml
index 90d7022f4d..94e39a931a 100644
--- a/test/integration/targets/git/tasks/gpg-verification.yml
+++ b/test/integration/targets/git/tasks/gpg-verification.yml
@@ -183,6 +183,8 @@
 - name: GPG-VERIFICATION | Stop gpg-agent so we can remove any locks on the GnuPG dir
   command: gpgconf --kill gpg-agent
   when: ansible_os_family != 'Suse'  # OpenSUSE ships with an older version of gpg-agent that doesn't support this
+  environment:
+    GNUPGHOME: "{{ git_gpg_gpghome }}"
 
 - name: GPG-VERIFICATION | Remove GnuPG verification workdir
   file:
diff --git a/test/runner/completion/docker.txt b/test/runner/completion/docker.txt
index 44e7463d77..9d2b457e63 100644
--- a/test/runner/completion/docker.txt
+++ b/test/runner/completion/docker.txt
@@ -7,3 +7,4 @@ opensuse42.3 name=quay.io/ansible/opensuse42.3-test-container:1.4.0 seccomp=unco
 ubuntu1404 name=quay.io/ansible/ubuntu1404-test-container:1.4.0 seccomp=unconfined
 ubuntu1604 name=quay.io/ansible/ubuntu1604-test-container:1.4.0 seccomp=unconfined
 ubuntu1604py3 name=quay.io/ansible/ubuntu1604py3-test-container:1.4.0 seccomp=unconfined python=3
+ubuntu1804 name=quay.io/ansible/ubuntu1804-test-container:1.6.0 seccomp=unconfined python=3