diff --git a/scripts/amazon_ebs_image_inner_chroot_script.sh b/scripts/amazon_ebs_image_inner_chroot_script.sh
index 774b118..89e817d 100755
--- a/scripts/amazon_ebs_image_inner_chroot_script.sh
+++ b/scripts/amazon_ebs_image_inner_chroot_script.sh
@@ -1,5 +1,8 @@
 #!/bin/sh
 
+/usr/sbin/env-update
+. /etc/profile
+
 # make sure there is no stale pid file around that prevents entropy from running
 rm -f /var/run/entropy/entropy.lock
 
diff --git a/scripts/amazon_ebs_image_inner_chroot_script_after.sh b/scripts/amazon_ebs_image_inner_chroot_script_after.sh
index 791a018..aeafbdd 100755
--- a/scripts/amazon_ebs_image_inner_chroot_script_after.sh
+++ b/scripts/amazon_ebs_image_inner_chroot_script_after.sh
@@ -1,5 +1,8 @@
 #!/bin/sh
 
+/usr/sbin/env-update
+. /etc/profile
+
 echo
 echo "Configuring AMI root filesystem"
 echo "Ext4 is the expected filesystem type"
@@ -7,9 +10,6 @@ echo "/dev/sda1 is the expected root filesystem partition"
 echo "ec2-user is the expected user"
 echo
 
-/usr/sbin/env-update
-. /etc/profile
-
 # setup networking, make sure networkmanager is gone
 rc-update del NetworkManager boot
 rc-update del NetworkManager default
diff --git a/scripts/amd64_x86_inner_chroot_script_after.sh b/scripts/amd64_x86_inner_chroot_script_after.sh
index aa07f09..e52da6b 100755
--- a/scripts/amd64_x86_inner_chroot_script_after.sh
+++ b/scripts/amd64_x86_inner_chroot_script_after.sh
@@ -1,5 +1,8 @@
 #!/bin/sh
 
+/usr/sbin/env-update
+. /etc/profile
+
 # Setup Desktop links
 # ARM Images links
 ln -s "/mnt/cdrom/ARM" "/etc/skel/Desktop/ARM_Images"
diff --git a/scripts/image_generic_inner_chroot_script_after.sh b/scripts/image_generic_inner_chroot_script_after.sh
index b30681b..2e0b714 100755
--- a/scripts/image_generic_inner_chroot_script_after.sh
+++ b/scripts/image_generic_inner_chroot_script_after.sh
@@ -1,12 +1,12 @@
 #!/bin/sh
 
+/usr/sbin/env-update
+. /etc/profile
+
 echo
 echo "Configuring AMI chroot"
 echo
 
-/usr/sbin/env-update
-. /etc/profile
-
 # setup networking, make sure networkmanager is gone
 rc-update del networkmanager default &> /dev/null
 # add eth0, should get dhcp by default already
diff --git a/scripts/inner_chroot_script.sh b/scripts/inner_chroot_script.sh
index a54591b..89bc298 100755
--- a/scripts/inner_chroot_script.sh
+++ b/scripts/inner_chroot_script.sh
@@ -1,5 +1,8 @@
 #!/bin/bash
 
+/usr/sbin/env-update
+. /etc/profile
+
 # create /proc if it doesn't exist
 # rsync doesn't copy it
 if [ ! -d "/proc" ]; then
@@ -19,9 +22,6 @@ rm -rf /root
 cp /etc/skel /root -Rap
 chown root:root /root -R
 
-/usr/sbin/env-update
-. /etc/profile
-
 # Setup locale to en_US
 echo LANG=\"en_US.UTF-8\" > /etc/env.d/02locale
 echo LANGUAGE=\"en_US.UTF-8\" >> /etc/env.d/02locale
diff --git a/scripts/remaster_gaming_inner_chroot_script_after.sh b/scripts/remaster_gaming_inner_chroot_script_after.sh
index b4f8574..23be6f8 100755
--- a/scripts/remaster_gaming_inner_chroot_script_after.sh
+++ b/scripts/remaster_gaming_inner_chroot_script_after.sh
@@ -1,5 +1,8 @@
 #!/bin/sh
 
+/usr/sbin/env-update
+. /etc/profile
+
 # FUTURE NOTE:
 # this might get merged into remaster_generic_inner_chroot_script_after.sh
 # once the Gaming Edition will be rebased on top of SpinBase, now it's based
diff --git a/scripts/remaster_generic_inner_chroot_script.sh b/scripts/remaster_generic_inner_chroot_script.sh
index a0a1082..e155ce7 100755
--- a/scripts/remaster_generic_inner_chroot_script.sh
+++ b/scripts/remaster_generic_inner_chroot_script.sh
@@ -1,5 +1,8 @@
 #!/bin/sh
 
+/usr/sbin/env-update
+. /etc/profile
+
 # make sure there is no stale pid file around that prevents entropy from running
 rm -f /var/run/entropy/entropy.lock
 
diff --git a/scripts/remaster_generic_inner_chroot_script_after.sh b/scripts/remaster_generic_inner_chroot_script_after.sh
index f39a569..a5c0740 100755
--- a/scripts/remaster_generic_inner_chroot_script_after.sh
+++ b/scripts/remaster_generic_inner_chroot_script_after.sh
@@ -1,6 +1,5 @@
 #!/bin/bash
 
-# do not remove these
 /usr/sbin/env-update
 . /etc/profile
 
diff --git a/scripts/remaster_serverbase_inner_chroot_script_after.sh b/scripts/remaster_serverbase_inner_chroot_script_after.sh
index 98f76e1..4f84112 100755
--- a/scripts/remaster_serverbase_inner_chroot_script_after.sh
+++ b/scripts/remaster_serverbase_inner_chroot_script_after.sh
@@ -1,5 +1,8 @@
 #!/bin/sh
 
+/usr/sbin/env-update
+. /etc/profile
+
 rc-update del installer-gui boot
 rc-update del x-setup boot
 rc-update del hald boot