diff --git a/.gitignore b/.gitignore
index 3ae85aa..96a23b6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,8 +1,6 @@
 deploy/*
 work/*
 postrun.sh
-SKIP
-SKIP_IMAGES
 .pc
 *-pc
 apt-cacher-ng/
diff --git a/config b/config
index 5bfd4eb..935a70c 100644
--- a/config
+++ b/config
@@ -5,5 +5,4 @@ export TIMEZONE_DEFAULT="America/Los_Angeles"
 export DEFAULT_TIMEZONE=America/Los_Angeles
 export FIRST_USER_NAME=pi
 export FIRST_USER_PASS="raspberry"
-export ENABLE_SSH=1
-export STAGE_LIST="stage0 stage1 stage2"
\ No newline at end of file
+export ENABLE_SSH=1
\ No newline at end of file
diff --git a/stage2/04-custom-tweaks/01-run.sh b/stage2/04-custom-tweaks/01-run.sh
index e5ff853..1a5614c 100755
--- a/stage2/04-custom-tweaks/01-run.sh
+++ b/stage2/04-custom-tweaks/01-run.sh
@@ -7,10 +7,4 @@ echo "Installing docker..."
 on_chroot << EOF
 curl -sSL get.docker.com | sh
 usermod -aG docker ${FIRST_USER_NAME}
-EOF
-
-# Ensure ${FIRST_USER_NAME} is set up for auto-login
-echo "Setting up ${FIRST_USER_NAME} for auto-login"
-on_chroot << EOF
-	SUDO_USER="${FIRST_USER_NAME}" raspi-config nonint do_boot_behaviour B4
 EOF
\ No newline at end of file
diff --git a/stage3/SKIP b/stage3/SKIP
new file mode 100644
index 0000000..e69de29
diff --git a/stage4/SKIP b/stage4/SKIP
new file mode 100644
index 0000000..e69de29
diff --git a/stage4/SKIP_IMAGES b/stage4/SKIP_IMAGES
new file mode 100644
index 0000000..e69de29
diff --git a/stage5/SKIP b/stage5/SKIP
new file mode 100644
index 0000000..e69de29
diff --git a/stage5/SKIP_IMAGES b/stage5/SKIP_IMAGES
new file mode 100644
index 0000000..e69de29