diff --git a/Makefile b/Makefile
index 0ebfcac..8593cc2 100644
--- a/Makefile
+++ b/Makefile
@@ -15,7 +15,7 @@
 ANSIBLE_ROLES     ?= $(wildcard roles/*)
 
 # YAML files, excluding venv and cookiecutter directories
-YAML_FILES        ?= $(shell find . -type d \( -path "./venv_onfansible" -o -path "./cookiecutters" -o -path "./ansible_collections" -o -path "./roles" \) -prune -o -type f \( -name '*.yaml' -o -name '*.yml' \) -print )
+YAML_FILES        ?= $(shell find . -type d \( -path "./venv_onfansible" -o -path "./cookiecutters" -o -path "./ansible_collections" -o -path "./roles" -o -path "./inventory/host_vars" \) -prune -o -type f \( -name '*.yaml' -o -name '*.yml' \) -print )
 
 # all files with extensions
 PYTHON_FILES      ?= $(wildcard scripts/*.py filter_plugins/*.py lint_rules/*.py cookiecutters/*/hooks/*.py roles/*/filter_plugins/*.py)
diff --git a/inventory/group_vars/aethercompute.yml b/inventory/group_vars/aethercompute.yml
index 819930c..13f237b 100644
--- a/inventory/group_vars/aethercompute.yml
+++ b/inventory/group_vars/aethercompute.yml
@@ -4,7 +4,9 @@
   - username: terraform
     comment: "ONF Terraform User"
     bcrypt: "$2b$16$p84d6ZoGqUzSkyFbpe57F.ixkjRH90OrsdAd3ParvyD8fjdr5PRjq"
-    sha512crypt: "$6$rounds=656000$ar82qB2qG7rZh4UO$ouQDba2wRoThRI1D6D/Zmf0kXVWCNbF4DNTmxT91OVp3m1/c3CXsbyR2wCefQS1GZQcd7Z5qdq00lSQ.xdpSA/"
+    sha512crypt: >
+        $6$rounds=656000$ar82qB2qG7rZh4UO$ouQDba2wRoThRI1D6D/Zmf0kXVWCNbF4
+        DNTmxT91OVp3m1/c3CXsbyR2wCefQS1GZQcd7Z5qdq00lSQ.xdpSA/
     sudoer: true
 
 users_sudoers:
diff --git a/inventory/group_vars/aetherfabric.yml b/inventory/group_vars/aetherfabric.yml
index b3c0f03..8db5213 100644
--- a/inventory/group_vars/aetherfabric.yml
+++ b/inventory/group_vars/aetherfabric.yml
@@ -3,7 +3,9 @@
   - username: terraform
     comment: "ONF Terraform User"
     bcrypt: "$2b$16$p84d6ZoGqUzSkyFbpe57F.ixkjRH90OrsdAd3ParvyD8fjdr5PRjq"
-    sha512crypt: "$6$rounds=656000$ar82qB2qG7rZh4UO$ouQDba2wRoThRI1D6D/Zmf0kXVWCNbF4DNTmxT91OVp3m1/c3CXsbyR2wCefQS1GZQcd7Z5qdq00lSQ.xdpSA/"
+    sha512crypt: >
+        $6$rounds=656000$ar82qB2qG7rZh4UO$ouQDba2wRoThRI1D6D/Zmf0kXVWCNbF4
+        DNTmxT91OVp3m1/c3CXsbyR2wCefQS1GZQcd7Z5qdq00lSQ.xdpSA/"
     sudoer: true
 
 users_sudoers:
diff --git a/playbooks/aetherusrp-playbook.yml b/playbooks/aetherusrp-playbook.yml
index 94b7225..5162ec6 100644
--- a/playbooks/aetherusrp-playbook.yml
+++ b/playbooks/aetherusrp-playbook.yml
@@ -1,3 +1,4 @@
+---
 # Ansible playbook to configure aether compute nodes
 # In specific, NUCs connected to USRPs
 # To be used in SD-RAN deployments:
diff --git a/playbooks/jenkins-playbook.yml b/playbooks/jenkins-playbook.yml
index cb38026..a06e64f 100644
--- a/playbooks/jenkins-playbook.yml
+++ b/playbooks/jenkins-playbook.yml
@@ -1,3 +1,4 @@
+---
 # Ansible playbook to configure jenkins
 
 - name: Configure jenkins
diff --git a/playbooks/router-playbook.yml b/playbooks/router-playbook.yml
index ca614a1..27bbee1 100644
--- a/playbooks/router-playbook.yml
+++ b/playbooks/router-playbook.yml
@@ -5,11 +5,10 @@
   hosts: router
   become: true
   roles:
-#   - netprep
+    # - netprep
     - nsd
     - unbound
     - dhcpd
-#   - nginx
-#   - onieboot
-#   - users
-
+    # - nginx
+    # - onieboot
+    # - users
diff --git a/scripts/base_edgeconfig.yaml b/scripts/base_edgeconfig.yaml
index 64322f0..c980972 100644
--- a/scripts/base_edgeconfig.yaml
+++ b/scripts/base_edgeconfig.yaml
@@ -18,7 +18,9 @@
   - username: terraform
     comment: "ONF Terraform User"
     bcrypt: "$2b$16$p84d6ZoGqUzSkyFbpe57F.ixkjRH90OrsdAd3ParvyD8fjdr5PRjq"
-    sha512crypt: "$6$rounds=656000$ar82qB2qG7rZh4UO$ouQDba2wRoThRI1D6D/Zmf0kXVWCNbF4DNTmxT91OVp3m1/c3CXsbyR2wCefQS1GZQcd7Z5qdq00lSQ.xdpSA/"
+    sha512crypt: >
+        $6$rounds=656000$ar82qB2qG7rZh4UO$ouQDba2wRoThRI1D6D/Zmf0kXVWCNbF4
+        DNTmxT91OVp3m1/c3CXsbyR2wCefQS1GZQcd7Z5qdq00lSQ.xdpSA/
     sudoer: true
 
 users_sudoers: