diff --git a/ce-dev/ansible/setup.yml b/ce-dev/ansible/setup.yml
index 0eaa1c605..a4e1378b7 100644
--- a/ce-dev/ansible/setup.yml
+++ b/ce-dev/ansible/setup.yml
@@ -15,7 +15,7 @@
     - ansible.builtin.import_role:
         name: _init
     - ansible.builtin.import_role:
-        name: ce_provision
+        name: debian/ce_provision
     - name: Remove example git hooks.
       ansible.builtin.file:
         path: "/home/ce-dev/ce-provision/.git/hooks"
@@ -26,7 +26,7 @@
         dest: "/home/ce-dev/ce-provision/.git/hooks"
         state: link
     - ansible.builtin.import_role:
-        name: aws/aws_cli
+        name: debian/aws_cli
     - ansible.builtin.import_role:
         name: aws/aws_credentials
     - ansible.builtin.import_role:
diff --git a/scripts/_common.sh b/scripts/_common.sh
index ff4e51000..4c79e074f 100755
--- a/scripts/_common.sh
+++ b/scripts/_common.sh
@@ -22,14 +22,21 @@ LINT="no"
 ABSOLUTE_PLAYBOOK_PATH="no"
 PARALLEL_RUN="no"
 BOTO_PROFILE=""
+# Ensure build workspace exists.
 if [ ! -d "$BUILD_WORKSPACE_BASE" ]; then
     mkdir "$BUILD_WORKSPACE_BASE"
 fi
 BUILD_TMP_DIR=$(mktemp -d -p "$BUILD_WORKSPACE_BASE")
+# Ensure ce-provision data directory exists.
 ANSIBLE_DATA_DIR="$OWN_DIR/data"
 if [ ! -d "$ANSIBLE_DATA_DIR" ]; then
     mkdir "$ANSIBLE_DATA_DIR"
 fi
+# Load the contents of profile.d in case we added items to $PATH there.
+for f in /etc/profile.d/*; do
+# shellcheck source=/dev/null
+   . "$f"
+done
 # Parse options arguments.
 parse_options(){
   while [ "${1:-}" ]; do