diff --git a/inventories/client_dfa_tech/group_vars/all.yml b/inventories/clients/dfa_tech/group_vars/all.yml
similarity index 100%
rename from inventories/client_dfa_tech/group_vars/all.yml
rename to inventories/clients/dfa_tech/group_vars/all.yml
diff --git a/inventories/client_dfa_tech/hosts.yml b/inventories/clients/dfa_tech/hosts.yml
similarity index 100%
rename from inventories/client_dfa_tech/hosts.yml
rename to inventories/clients/dfa_tech/hosts.yml
diff --git a/inventories/client_local_eng/group_vars/all.yml b/inventories/clients/local_eng/group_vars/all.yml
similarity index 100%
rename from inventories/client_local_eng/group_vars/all.yml
rename to inventories/clients/local_eng/group_vars/all.yml
diff --git a/inventories/client_local_eng/hosts.yml b/inventories/clients/local_eng/hosts.yml
similarity index 100%
rename from inventories/client_local_eng/hosts.yml
rename to inventories/clients/local_eng/hosts.yml
diff --git a/inventories/client_local_eng/hypervisor_hosts.yml b/inventories/clients/local_eng/hypervisor_hosts.yml
similarity index 100%
rename from inventories/client_local_eng/hypervisor_hosts.yml
rename to inventories/clients/local_eng/hypervisor_hosts.yml
diff --git a/inventories/client_royal_pizza/group_vars/all.yml b/inventories/clients/royal_pizza/group_vars/all.yml
similarity index 100%
rename from inventories/client_royal_pizza/group_vars/all.yml
rename to inventories/clients/royal_pizza/group_vars/all.yml
diff --git a/inventories/client_royal_pizza/group_vars/firewalls.yml b/inventories/clients/royal_pizza/group_vars/firewalls.yml
similarity index 100%
rename from inventories/client_royal_pizza/group_vars/firewalls.yml
rename to inventories/clients/royal_pizza/group_vars/firewalls.yml
diff --git a/inventories/client_royal_pizza/hosts.yml b/inventories/clients/royal_pizza/hosts.yml
similarity index 100%
rename from inventories/client_royal_pizza/hosts.yml
rename to inventories/clients/royal_pizza/hosts.yml
diff --git a/inventories/client_sanrufo_homes/group_vars/all.yml b/inventories/clients/sanrufo_homes/group_vars/all.yml
similarity index 100%
rename from inventories/client_sanrufo_homes/group_vars/all.yml
rename to inventories/clients/sanrufo_homes/group_vars/all.yml
diff --git a/inventories/client_sanrufo_homes/hosts.yml b/inventories/clients/sanrufo_homes/hosts.yml
similarity index 100%
rename from inventories/client_sanrufo_homes/hosts.yml
rename to inventories/clients/sanrufo_homes/hosts.yml
diff --git a/scripts/onboard_client.sh b/scripts/onboard_client.sh
index ff05da7..89735a3 100755
--- a/scripts/onboard_client.sh
+++ b/scripts/onboard_client.sh
@@ -161,8 +161,8 @@ fi
 
 PROJECT_NAME="${PROJECT_NAME_OVERRIDE:-Client - ${CLIENT_NAME}}"
 KEY_FILE="/root/.ssh/client_${CLIENT_SLUG}"
-INVENTORY_DIR="$REPO_DIR/inventories/client_${CLIENT_SLUG}"
-INVENTORY_REPO_PATH="inventories/client_${CLIENT_SLUG}/hosts.yml"
+INVENTORY_DIR="$REPO_DIR/inventories/clients${CLIENT_SLUG}"
+INVENTORY_REPO_PATH="inventories/clients/${CLIENT_SLUG}/hosts.yml"
 
 # Determine hypervisor type for inventory
 case "$CLIENT_TYPE" in