diff --git a/Makefile b/Makefile
index 4eb8a63..5f21ef8 100644
--- a/Makefile
+++ b/Makefile
@@ -3,13 +3,13 @@ all: deps bootstrap homelab
 
 SHELL := /bin/bash
 bootstrap:
-	ansible-playbook bootstrap.yml -K -e ansible_ssh_user=cianhatton -e ansible_ssh_private_key_file=~/.ssh/id_rsa
+	ansible-playbook playbooks/bootstrap.yml -K -e ansible_ssh_user=cianhatton -e ansible_ssh_private_key_file=~/.ssh/id_rsa
 
 qnap:
-	ansible-playbook setup-homelab.yml --limit qnap
+	ansible-playbook playbooks/setup-homelab.yml --limit qnap
 
 homelab:
-	ansible-playbook setup-homelab.yml
+	ansible-playbook playbooks/setup-homelab.yml
 
 deps:
 	pip install -r requirements.txt
diff --git a/ansible.cfg b/ansible.cfg
index 62687a7..ac9166b 100644
--- a/ansible.cfg
+++ b/ansible.cfg
@@ -2,7 +2,8 @@
 default_module_path=library
 inventory=hosts.ini
 vault_password_file=.vault-pass.sh
-host_key_checking = False
+host_key_checking = True
 enable_plugins = linode
 private_key_file=~/.ssh/ansible
 remote_user=ansible
+roles_path = roles
diff --git a/bootstrap.yml b/playbooks/bootstrap.yml
similarity index 100%
rename from bootstrap.yml
rename to playbooks/bootstrap.yml
diff --git a/setup-homelab.yml b/playbooks/setup-homelab.yml
similarity index 100%
rename from setup-homelab.yml
rename to playbooks/setup-homelab.yml
diff --git a/setup-linode.yml b/playbooks/setup-linode.yml
similarity index 100%
rename from setup-linode.yml
rename to playbooks/setup-linode.yml
diff --git a/tests/ansible.cfg b/tests/ansible.cfg
index 992fb32..7f3db54 100644
--- a/tests/ansible.cfg
+++ b/tests/ansible.cfg
@@ -4,3 +4,4 @@ inventory=hosts.ini
 vault_password_file=.vault-pass.sh
 host_key_checking = False
 enable_plugins = linode
+roles_path = roles