diff --git a/containers/base/Containerfile b/containers/base/Containerfile
index 963ee2c..9952e4f 100644
--- a/containers/base/Containerfile
+++ b/containers/base/Containerfile
@@ -176,9 +176,9 @@ RUN mkdir -m 755 $ENTRYPOINT_DIR
 
 # Copy the entry point script, login shim, etc
 COPY entrypoint.sh /entrypoint.sh
-COPY fix_user.sh $ENTRYPOINT_DIR/00_fix_user.sh
-COPY login_shim.sh $ENTRYPOINT_DIR/01_login_shim.sh
-COPY shell_init.sh $ENTRYPOINT_DIR/04_shell_init.sh
+COPY entrypoint.d/fix_user.sh $ENTRYPOINT_DIR/10_fix_user.sh
+COPY entrypoint.d/login_shim.sh $ENTRYPOINT_DIR/11_login_shim.sh
+COPY entrypoint.d/shell_init.sh $ENTRYPOINT_DIR/14_shell_init.sh
 
 # Add ~/.bashrc.d support to the user's ~/.bashrc
 COPY bashrcd_fragment.bash /tmp/bashrcd_fragment.bash
diff --git a/containers/base/fix_user.sh b/containers/base/entrypoint.d/fix_user.sh
similarity index 100%
rename from containers/base/fix_user.sh
rename to containers/base/entrypoint.d/fix_user.sh
diff --git a/containers/base/login_shim.sh b/containers/base/entrypoint.d/login_shim.sh
similarity index 100%
rename from containers/base/login_shim.sh
rename to containers/base/entrypoint.d/login_shim.sh
diff --git a/containers/base/shell_init.sh b/containers/base/entrypoint.d/shell_init.sh
similarity index 100%
rename from containers/base/shell_init.sh
rename to containers/base/entrypoint.d/shell_init.sh
diff --git a/containers/emacs/Containerfile b/containers/emacs/Containerfile
index 95025a9..01e8aca 100644
--- a/containers/emacs/Containerfile
+++ b/containers/emacs/Containerfile
@@ -125,7 +125,7 @@ RUN { \
     } >> $DEV_USER_HOME/.bashrc
 
 # Copy entry point for config initialization
-COPY emacs_init.sh $ENTRYPOINT_DIR/80_emacs_init.sh
+COPY entrypoint.d/emacs_init.sh $ENTRYPOINT_DIR/80_emacs_init.sh
 
 # Persistent storage for the Emacs and Doom config directories. These
 # directories will be initialized with the Doom files from above.
diff --git a/containers/emacs/emacs_init.sh b/containers/emacs/entrypoint.d/emacs_init.sh
similarity index 100%
rename from containers/emacs/emacs_init.sh
rename to containers/emacs/entrypoint.d/emacs_init.sh
diff --git a/containers/ros/Containerfile b/containers/ros/Containerfile
index 35ffb0b..bb5b5d1 100644
--- a/containers/ros/Containerfile
+++ b/containers/ros/Containerfile
@@ -60,7 +60,7 @@ RUN apt-get update \
 RUN rosdep init
 
 # Copy the ROS entry point
-COPY ros_entrypoint.sh $ENTRYPOINT_DIR/20_ros_entrypoint.sh
+COPY entrypoint.d/ros_entrypoint.sh $ENTRYPOINT_DIR/20_ros_entrypoint.sh
 
 # Switch to non-root user
 USER $DEV_USER
diff --git a/containers/ros/ros_entrypoint.sh b/containers/ros/entrypoint.d/ros_entrypoint.sh
similarity index 100%
rename from containers/ros/ros_entrypoint.sh
rename to containers/ros/entrypoint.d/ros_entrypoint.sh
diff --git a/containers/user/Containerfile b/containers/user/Containerfile
index ec2f92d..37cb347 100644
--- a/containers/user/Containerfile
+++ b/containers/user/Containerfile
@@ -62,11 +62,11 @@ RUN groupmod --new-name $DEV_USER \
 
 # We cannot update PATH in the Dockerfile (it needs to be a straight assignment,
 # not using shell expansion, etc), so we must update PATH at runtime
-COPY fix_path.sh $ENTRYPOINT_DIR/02_fix_path.sh
+COPY entrypoint.d/fix_path.sh $ENTRYPOINT_DIR/12_fix_path.sh
 
 # We cannot fix the volumes in the Dockerfile, because their contents are frozen
 # after the VOLUME instruction, so we must update the ownership at runtime
-COPY fix_volumes.sh $ENTRYPOINT_DIR/03_fix_volumes.sh
+COPY entrypoint.d/fix_volumes.sh $ENTRYPOINT_DIR/13_fix_volumes.sh
 
 # Switch to non-root user
 USER $DEV_USER
diff --git a/containers/user/fix_path.sh b/containers/user/entrypoint.d/fix_path.sh
similarity index 100%
rename from containers/user/fix_path.sh
rename to containers/user/entrypoint.d/fix_path.sh
diff --git a/containers/user/fix_volumes.sh b/containers/user/entrypoint.d/fix_volumes.sh
similarity index 100%
rename from containers/user/fix_volumes.sh
rename to containers/user/entrypoint.d/fix_volumes.sh