diff --git a/Dockerfile b/Dockerfile
index 4095619..88fe1c5 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,9 +1,6 @@
 from archlinux:base-devel
 
 copy pacman.conf /etc/pacman.conf
-run pacman -Syu --noconfirm
-run pacman -S --noconfirm --needed --overwrite '*' bash
-run pacman -Fy --noconfirm
 copy init-image.bash /init-image.bash
 run /init-image.bash
 
diff --git a/Dockerfile.template b/Dockerfile.template
index 985b46b..3692fd4 100644
--- a/Dockerfile.template
+++ b/Dockerfile.template
@@ -1,9 +1,6 @@
 from archlinux:base-devel
 
 copy pacman.conf /etc/pacman.conf
-run pacman -Syu --noconfirm
-run pacman -S --noconfirm --needed --overwrite '*' bash
-run pacman -Fy --noconfirm
 copy init-image.bash /init-image.bash
 run /init-image.bash
 
diff --git a/init-image.bash b/init-image.bash
index 3d497e5..99a1ea4 100755
--- a/init-image.bash
+++ b/init-image.bash
@@ -5,6 +5,9 @@
 
 set -o errexit -o pipefail -o nounset
 
+pacman -Syu --noconfirm
+pacman -Fy --noconfirm
+
 packages=(
   base
   base-devel # makepkg depends on this