diff --git a/devstack/upgrade/shutdown.sh b/devstack/upgrade/shutdown.sh
index 76ef2c54f9..5f139914ca 100755
--- a/devstack/upgrade/shutdown.sh
+++ b/devstack/upgrade/shutdown.sh
@@ -11,7 +11,11 @@ source $GRENADE_DIR/functions
 source $BASE_DEVSTACK_DIR/functions
 source $BASE_DEVSTACK_DIR/stackrc # needed for status directory
 source $BASE_DEVSTACK_DIR/lib/tls
-source $BASE_DEVSTACK_DIR/lib/ironic
+source $BASE_DEVSTACK_DIR/lib/apache
+
+# Keep track of the DevStack directory
+IRONIC_DEVSTACK_DIR=$(dirname "$0")/..
+source $IRONIC_DEVSTACK_DIR/lib/ironic
 
 set -o xtrace
 
diff --git a/devstack/upgrade/upgrade.sh b/devstack/upgrade/upgrade.sh
index 61a335591f..ea36e52d25 100755
--- a/devstack/upgrade/upgrade.sh
+++ b/devstack/upgrade/upgrade.sh
@@ -41,7 +41,11 @@ source $TARGET_DEVSTACK_DIR/stackrc
 source $TARGET_DEVSTACK_DIR/lib/tls
 source $TARGET_DEVSTACK_DIR/lib/nova
 source $TARGET_DEVSTACK_DIR/lib/neutron-legacy
-source $TARGET_DEVSTACK_DIR/lib/ironic
+source $TARGET_DEVSTACK_DIR/lib/apache
+
+# Keep track of the DevStack directory
+IRONIC_DEVSTACK_DIR=$(dirname "$0")/..
+source $IRONIC_DEVSTACK_DIR/lib/ironic
 
 # Print the commands being run so that we can see the command that triggers
 # an error.  It is also useful for following allowing as the install occurs.