diff --git a/src/minimal_overlay/bundles/cf_cli/01_get.sh b/src/minimal_overlay/bundles/cf_cli/01_get.sh
index ae47f0360..534e2495c 100755
--- a/src/minimal_overlay/bundles/cf_cli/01_get.sh
+++ b/src/minimal_overlay/bundles/cf_cli/01_get.sh
@@ -2,10 +2,7 @@
 
 SRC_DIR=$(pwd)
 
-# Find the main source directory
-cd ../../..
-MAIN_SRC_DIR=$(pwd)
-cd $SRC_DIR
+. ../../common.sh
 
 # Grab everything after the '=' character.
 #DOWNLOAD_URL=$(grep -i CLOUD_FOUNDRY_CLI_URL $MAIN_SRC_DIR/.config | cut -f2 -d'=')
@@ -32,11 +29,11 @@ fi
 
 # Delete folder with previously prepared cloud foundry cli.
 echo "Removing cloud foundry cli work area. This may take a while..."
-rm -rf ../../work/overlay/clofo
-mkdir ../../work/overlay/clofo
+rm -rf $WORK_DIR/overlay/clofo
+mkdir $WORK_DIR/overlay/clofo
 
 # Copy cf-cli.tgz to folder 'work/overlay/clofo'.
-cp cf-cli.tgz ../../work/overlay/clofo
+cp cf-cli.tgz $WORK_DIR/overlay/clofo
 
 cd $SRC_DIR
 
diff --git a/src/minimal_overlay/bundles/cf_cli/02_install.sh b/src/minimal_overlay/bundles/cf_cli/02_install.sh
index 4a125cace..70314f276 100755
--- a/src/minimal_overlay/bundles/cf_cli/02_install.sh
+++ b/src/minimal_overlay/bundles/cf_cli/02_install.sh
@@ -2,17 +2,14 @@
 
 SRC_DIR=$(pwd)
 
-# Find the main source directory
-cd ../../..
-MAIN_SRC_DIR=$(pwd)
-cd $SRC_DIR
+. ../../common.sh
 
 echo "Removing old cloud foundry artifacts. This may take a while..."
-rm -rf $MAIN_SRC_DIR/work/overlay/clofo/clofo_installed
-mkdir -p $MAIN_SRC_DIR/work/overlay/clofo/clofo_installed/opt/clofo
-mkdir -p $MAIN_SRC_DIR/work/overlay/clofo/clofo_installed/bin
+rm -rf $WORK_DIR/overlay/clofo/clofo_installed
+mkdir -p $WORK_DIR/overlay/clofo/clofo_installed/opt/clofo
+mkdir -p $WORK_DIR/overlay/clofo/clofo_installed/bin
 
-cd $MAIN_SRC_DIR/work/overlay/clofo
+cd $WORK_DIR/overlay/clofo
 
 cp $MAIN_SRC_DIR/source/overlay/cf-cli.tgz .
 
@@ -20,14 +17,13 @@ tar -xvf cf-cli.tgz
 rm -f LICENSE NOTICE cf-cli.tgz
 chmod +rx cf
 
-cp cf $MAIN_SRC_DIR/work/overlay/clofo/clofo_installed/opt/clofo/cf
+cp cf $WORK_DIR/overlay/clofo/clofo_installed/opt/clofo/cf
 
-cd $MAIN_SRC_DIR/work/overlay/clofo/clofo_installed
+cd $WORK_DIR/overlay/clofo/clofo_installed
 
 ln -s ../opt/clofo/cf bin/cf
 
-cp -r $MAIN_SRC_DIR/work/overlay/clofo/clofo_installed/* \
-  $MAIN_SRC_DIR/work/src/minimal_overlay/rootfs
+cp -r $WORK_DIR/overlay/clofo/clofo_installed/* $WORK_DIR/src/minimal_overlay/rootfs
 
 echo "cloud foundry cli has been installed."