diff --git a/labs/osbash/lib/osbash/kvm-functions.sh b/labs/osbash/lib/osbash/kvm-functions.sh
index f1606b76..d367107e 100644
--- a/labs/osbash/lib/osbash/kvm-functions.sh
+++ b/labs/osbash/lib/osbash/kvm-functions.sh
@@ -1,3 +1,5 @@
+source "$CONFIG_DIR/provider.$PROVIDER"
+
 #-------------------------------------------------------------------------------
 # virt-install / virsh
 #-------------------------------------------------------------------------------
diff --git a/labs/osbash/lib/osbash/virtualbox-functions.sh b/labs/osbash/lib/osbash/virtualbox-functions.sh
index 21650d1b..fc8f98b6 100644
--- a/labs/osbash/lib/osbash/virtualbox-functions.sh
+++ b/labs/osbash/lib/osbash/virtualbox-functions.sh
@@ -1,3 +1,5 @@
+source "$CONFIG_DIR/provider.$PROVIDER"
+
 #-------------------------------------------------------------------------------
 # VirtualBoxManage
 #-------------------------------------------------------------------------------
diff --git a/labs/osbash/osbash.sh b/labs/osbash/osbash.sh
index 50d7109d..7e3dc95a 100755
--- a/labs/osbash/osbash.sh
+++ b/labs/osbash/osbash.sh
@@ -12,7 +12,6 @@ source "$TOP_DIR/config/localrc"
 source "$TOP_DIR/config/paths"
 source "$CONFIG_DIR/openstack"
 source "$CONFIG_DIR/deploy.osbash"
-source "$CONFIG_DIR/provider.$PROVIDER"
 source "$OSBASH_LIB_DIR/lib.$DISTRO.sh"
 source "$OSBASH_LIB_DIR/functions-host.sh"
 source "$OSBASH_LIB_DIR/$PROVIDER-functions.sh"
diff --git a/labs/osbash/tools/repeat-test.sh b/labs/osbash/tools/repeat-test.sh
index 5d529259..6cd08270 100755
--- a/labs/osbash/tools/repeat-test.sh
+++ b/labs/osbash/tools/repeat-test.sh
@@ -4,7 +4,6 @@ TOP_DIR=$(cd "$(dirname "$0")/.." && pwd)
 source "$TOP_DIR/config/localrc"
 source "$TOP_DIR/config/paths"
 source "$CONFIG_DIR/deploy.osbash"
-source "$CONFIG_DIR/provider.$PROVIDER"
 source "$OSBASH_LIB_DIR/functions-host.sh"
 source "$OSBASH_LIB_DIR/$PROVIDER-functions.sh"
 
diff --git a/labs/osbash/tools/restore-cluster.sh b/labs/osbash/tools/restore-cluster.sh
index 7dfd1eb0..3dfcadc1 100755
--- a/labs/osbash/tools/restore-cluster.sh
+++ b/labs/osbash/tools/restore-cluster.sh
@@ -5,7 +5,6 @@ TOP_DIR=$(cd "$(dirname "$0")/.." && pwd)
 source "$TOP_DIR/config/localrc"
 source "$TOP_DIR/config/paths"
 source "$CONFIG_DIR/deploy.osbash"
-source "$CONFIG_DIR/provider.$PROVIDER"
 source "$OSBASH_LIB_DIR/functions-host.sh"
 source "$OSBASH_LIB_DIR/$PROVIDER-functions.sh"