@@ -60,11 +60,6 @@ declare -r SCRIPT_NAME="$(basename ${0})"
 
 # ---- Configuration variables ----
 
-# Paths to look through if '.debops.cfg' is found in local directory
-DEBOPS_PLAYBOOKS_PATHS=(
-  "${PWD}/debops-playbooks"
-)
-
 # Paths to look through if local install is not found
 DEBOPS_PLAYBOOKS_INSTALL_PATHS=(
   "${DEBOPS_DATA_HOME}/debops-playbooks"
@@ -227,12 +222,8 @@ debops_config="$(find_up)"
 
 # ---- Main script ----
 
-# Check if required commands are available
-for name in git ; do
-  if ! type ${name} > /dev/null 2>&1 ; then
-    echo >&2 "${SCRIPT_NAME}: Error: ${name}: command not found" ; exit 1
-  fi
-done
+# Make sure required commands are present
+require_commands ansible-playbook
 
 # Select default installation directory
 debops_install_path="${DEBOPS_DEFAULT_INSTALL_PATH}"
@@ -261,20 +252,16 @@ if [ -n "${project}" ] ; then
 # If there's no project specified, look for playbooks in known locations
 else
 
-  # Check if playbooks are installed in local directory
+  # Check if playbooks are installed in current project directory
   if [ -z "${debops_playbooks}" ] ;then
-    if [ -f ${PWD}/${DEBOPS_CONFIG} ] ; then
-      for playbook_path in "${DEBOPS_PLAYBOOKS_PATHS[@]}" ; do
-        if [ -f ${playbook_path}/${DEBOPS_SITE_PLAYBOOK} ] ; then
-          debops_playbooks="${playbook_path}"
-          break
-        fi
-      done
+    if [ -n "${debops_root}" ] ; then
+      if [ -f ${debops_root}/debops-playbooks/${DEBOPS_SITE_PLAYBOOK} ] ; then
+        debops_playbooks="${debops_root}/debops-playbooks"
+      fi
     fi
   fi
 
-  # If playbooks have not been found in local directory, look for them in known
-  # locations
+  # If playbooks have not been found yet, look for them in known locations
   if [ -z "${debops_playbooks}" ] ; then
     for playbook_path in "${DEBOPS_PLAYBOOKS_INSTALL_PATHS[@]}" ; do
       if [ -f ${playbook_path}/${DEBOPS_SITE_PLAYBOOK} ] ; then