diff --git a/kayobe-env b/kayobe-env
index f820d76..366db0d 100644
--- a/kayobe-env
+++ b/kayobe-env
@@ -32,3 +32,28 @@ export KOLLA_CONFIG_PATH=$KAYOBE_CONFIG_ROOT/etc/kolla
 base_path=$(realpath $KAYOBE_CONFIG_ROOT/../../)
 export KOLLA_SOURCE_PATH=${KOLLA_SOURCE_PATH:-${base_path}/src/kolla-ansible}
 export KOLLA_VENV_PATH=${KOLLA_VENV_PATH:-${base_path}/venvs/kolla-ansible}
+
+if [ "$1" = "--environment" ]; then
+  if [ "$#" -ne 2 ]; then
+    echo "usage: ${BASH_SOURCE[0]:-${(%):-%x}} [--environment <env-name>]"
+  else
+    kayobe_env="$2"
+
+    # Look for existing Kayobe environments
+    if [ -d "${KAYOBE_CONFIG_PATH}/environments" ]; then
+      if [ -d "${KAYOBE_CONFIG_PATH}/environments/${kayobe_env}" ]; then
+        export KAYOBE_ENVIRONMENT="${kayobe_env}"
+        echo "Using Kayobe environment ${KAYOBE_ENVIRONMENT}"
+      else
+        echo "Unable to find Kayobe environment ${kayobe_env} in ${KAYOBE_CONFIG_PATH}/environments"
+        return 1
+      fi
+    else
+      echo "Cannot find environments folder in ${KAYOBE_CONFIG_PATH}"
+      return 1
+    fi
+  fi
+elif [ "$#" -ne 0 ]; then
+  echo "usage: ${BASH_SOURCE[0]:-${(%):-%x}} [--environment <env-name>]"
+  return 1
+fi