diff --git a/.travis.yml b/.travis.yml
index 705df0f6..8bd17100 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,7 +4,7 @@ services:
   - docker
 env:
   global:
-    - DOCKER="goldarte/img-tool:builder-mod"
+    - DOCKER="sfalexrog/img-tool:builder-mod"
     - TARGET_REPO="https://github.com/${TRAVIS_REPO_SLUG}.git"
     - if [[ -z ${TRAVIS_TAG} ]]; then IMAGE_VERSION="${TRAVIS_COMMIT}}"; else IMAGE_VERSION="${TRAVIS_TAG}"; fi
     - IMAGE_NAME="$(basename -s '.git' ${TARGET_REPO})_${IMAGE_VERSION}.img"
diff --git a/builder/image-software.sh b/builder/image-software.sh
index cd4e00fb..02a54a92 100755
--- a/builder/image-software.sh
+++ b/builder/image-software.sh
@@ -140,5 +140,8 @@ EOF
 
 echo_stamp "Attempting to kill dirmngr"
 gpgconf --kill dirmngr
+# dirmngr is only used by apt-key, so we can safely kill it.
+# We ignore killall's exit value as well.
+killall -w -9 dirmngr || true
 
 echo_stamp "End of software installation"