diff --git a/ansible-pull.cfg b/ansible-pull.cfg
index 4692bc4..74beb5d 100644
--- a/ansible-pull.cfg
+++ b/ansible-pull.cfg
@@ -1,8 +1,12 @@
 [defaults]
+gathering = smart
+interpreter_python = python3
 inventory = inventory
 roles_path = roles
-deprecation_warnings = false
+# Secrets
 ask_become_pass = false
 ask_vault_pass = false
-pipelining = true
-interpreter_python = python3
+# Warnings
+command_warnings = true
+#deprecation_warnings = false
+system_warnings = true
diff --git a/ansible.cfg b/ansible.cfg
index 0dc5725..6ca5029 100644
--- a/ansible.cfg
+++ b/ansible.cfg
@@ -1,11 +1,19 @@
 [defaults]
+gathering = smart
+interpreter_python = python3
 inventory = inventory
 roles_path = roles
+# Connection info
 private_key_file = ~/.ssh/ansible
-ssh_extra_args =-o ForwardAgent=yes -o StrictHostKeyChecking=no
 host_key_checking = false
-deprecation_warnings = false
+# Secrets
 ask_become_pass = true
 ask_vault_pass = true
+# Warnings
+command_warnings = true
+#deprecation_warnings = false
+system_warnings = true
+
+[ssh_connection]
 pipelining = true
-interpreter_python = python3
+ssh_extra_args =-o ForwardAgent=yes -o StrictHostKeyChecking=no