diff --git a/stage2/04-docker-compose/00-packages b/stage2/04-docker-compose/00-packages
deleted file mode 100644
index 243e482..0000000
--- a/stage2/04-docker-compose/00-packages
+++ /dev/null
@@ -1 +0,0 @@
-docker.io
diff --git a/stage2/04-install-docker/00-run.sh b/stage2/04-install-docker/00-run.sh
new file mode 100755
index 0000000..ab38a9a
--- /dev/null
+++ b/stage2/04-install-docker/00-run.sh
@@ -0,0 +1,13 @@
+#!/bin/bash -e
+echo "Installing Docker"
+on_chroot << EOF
+export CURL_CA_BUNDLE=/etc/ssl/certs/ca-certificates.crt
+curl -fsSL https://get.docker.com | sh
+EOF
+
+echo "Adding user to the 'docker' group"
+echo "Also fixing permissions on folders"
+on_chroot << EOF
+usermod -a -G docker $FIRST_USER_NAME
+chown -R $FIRST_USER_NAME:$FIRST_USER_NAME /home/$FIRST_USER_NAME
+EOF
\ No newline at end of file
diff --git a/stage2/04-docker-compose/01-run.sh b/stage2/05-docker-compose/01-run.sh
similarity index 98%
rename from stage2/04-docker-compose/01-run.sh
rename to stage2/05-docker-compose/01-run.sh
index 71d9f66..0e6b389 100755
--- a/stage2/04-docker-compose/01-run.sh
+++ b/stage2/05-docker-compose/01-run.sh
@@ -1,5 +1,6 @@
-# Install docker via pip3 (within chroot)
+#!/bin/bash -e
 
+# Install docker via pip3 (within chroot)
 echo "Installing docker-compose from pip3, and also setting up the box folder structure"
 
 on_chroot << EOF
diff --git a/stage2/04-docker-compose/files/compose-service b/stage2/05-docker-compose/files/compose-service
similarity index 100%
rename from stage2/04-docker-compose/files/compose-service
rename to stage2/05-docker-compose/files/compose-service
diff --git a/stage2/06-fix-docker-perms/01-run.sh b/stage2/06-fix-docker-perms/01-run.sh
deleted file mode 100755
index e3dd275..0000000
--- a/stage2/06-fix-docker-perms/01-run.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-echo "Adding lncm to DOCKER group"
-echo "Also fixing permissions on folders"
-on_chroot << EOF
-usermod -a -G docker $FIRST_USER_NAME
-chown -R $FIRST_USER_NAME:$FIRST_USER_NAME /home/$FIRST_USER_NAME
-EOF
-
diff --git a/stage2/05-prepare-home-dir/01-run.sh b/stage2/06-prepare-home-dir/01-run.sh
similarity index 100%
rename from stage2/05-prepare-home-dir/01-run.sh
rename to stage2/06-prepare-home-dir/01-run.sh