diff --git a/config b/config
index 47a5c29..2bcf721 100644
--- a/config
+++ b/config
@@ -6,5 +6,4 @@ TARGET_HOSTNAME=auracaster
 FIRST_USER_NAME=caster
 FIRST_USER_PASS=pw
 
-# Custom stage to run after stage2
-STAGE_LIST="stage0 stage1 stage2 stage2.1_custom"
+STAGE_LIST="stage0 stage1 stage2"
diff --git a/stage2.1_custom/prerun.sh b/stage2.1_custom/prerun.sh
deleted file mode 100755
index 9acd13c..0000000
--- a/stage2.1_custom/prerun.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/bash -e
-
-if [ ! -d "${ROOTFS_DIR}" ]; then
-	copy_previous
-fi
diff --git a/stage2.1_custom/00-install/00-run.sh b/stage2/04-auracaster_customization/00-run-chroot.sh
similarity index 98%
rename from stage2.1_custom/00-install/00-run.sh
rename to stage2/04-auracaster_customization/00-run-chroot.sh
index f7e9cdc..853e8eb 100755
--- a/stage2.1_custom/00-install/00-run.sh
+++ b/stage2/04-auracaster_customization/00-run-chroot.sh
@@ -23,7 +23,7 @@ echo \
   bookworm stable" | \
   tee /etc/apt/sources.list.d/docker.list > /dev/null
 apt-get update
-apt-get install -y docker-ce docker-ce-cli containerd.io docker-buildx-plugin docker-compose-plugin
+apt-get install -y docker-ce docker-ce-cli containerd.io docker-compose-plugin
 
 # Ensure docker group exists and add main user to it
 DOCKER_GROUP=docker