diff --git a/functions b/functions
index f5b0cb3..4a4696f 100644
--- a/functions
+++ b/functions
@@ -679,6 +679,10 @@ function run_kayobe {
         kayobe_limit=(--limit "$KAYOBE_LIMIT")
     fi
 
+    # Prevent Kayobe from complaining that you are running from
+    # a repository that is not $KAYOBE_CONFIG_PATH
+    cd $KAYOBE_CONFIG_PATH
+
     kayobe "${@}" "${kayobe_limit[@]}" "${kayobe_tags[@]}" "${kolla_limit[@]}" "${kolla_tags[@]}" ${KAYOBE_EXTRA_ARGS}
 }
 
diff --git a/scripts/config-diff.sh b/scripts/config-diff.sh
index 04c2229..cd17a45 100755
--- a/scripts/config-diff.sh
+++ b/scripts/config-diff.sh
@@ -205,6 +205,9 @@ function generate_config {
 
     export KAYOBE_VAULT_PASSWORD=dummy-password
 
+    # Prevent Kayobe from complaining that you are running from
+    # a repository that is not $KAYOBE_CONFIG_PATH
+    cd $KAYOBE_CONFIG_PATH
     kayobe control host bootstrap
     log_info "Generating config to $output_dir"
     kayobe playbook run "$kayobe_ansible_path/kayobe-automation-prepare-config-diff.yml"