diff --git a/etc/archboot/x86_64-offline.conf b/etc/archboot/x86_64-offline.conf
index ceb156b15..35661f631 100644
--- a/etc/archboot/x86_64-offline.conf
+++ b/etc/archboot/x86_64-offline.conf
@@ -12,7 +12,7 @@ FILES=()
 # Please change the hooks only if you know what you are doing.
 HOOKS=(udev keyboard archboot_base_common archboot_base_latest \
 archboot_installer_common archboot_installer_latest archboot_kexec \
-archboot_licenses)
+archboot_licenses archboot_installer_offline)
 
 # COMPRESSION
 # Use this to compress the initramfs image. By default, gzip compression
diff --git a/usr/bin/archboot-update-installer.sh b/usr/bin/archboot-update-installer.sh
index 289e4b9ff..06aaf6ecb 100755
--- a/usr/bin/archboot-update-installer.sh
+++ b/usr/bin/archboot-update-installer.sh
@@ -101,6 +101,10 @@ if [[ "${_L_COMPLETE}" == "1" || "${_L_INSTALL_COMPLETE}" == "1" ]]; then
     done
     echo "Step 2/8: Generating archboot container in ${_W_DIR} ..."
     echo "          This will need some time ..."
+    # wait until pacman-key is finished
+    while ps aux | grep pacman | grep -q batch; do
+        sleep 1
+    done
     # create container without package cache
     [[ "${_L_COMPLETE}" == "1" ]] && ("archboot-${_RUNNING_ARCH}-create-container.sh" "${_W_DIR}" -cc -cp >/dev/tty7 2>&1 || exit 1)
     # Switch offline mode