diff --git a/roles/bootstrap/defaults/main/general.yml b/roles/bootstrap/defaults/main/general.yml
index 79a474f..7c77d63 100644
--- a/roles/bootstrap/defaults/main/general.yml
+++ b/roles/bootstrap/defaults/main/general.yml
@@ -1,16 +1,11 @@
 ---
+# defaults file for bootstrap
 admins: ~
 guests: ~
 users: ~
 roots: ~
-pubkeys: ~
-root_acct: ~
-nonlogin_method: ~
-extra_packages: ~
-official_name: ~
-official_email: ~
-gpg_sign_id: ~
-homedir: ~
-cimages: ~
 enrollment_key: ~
-gcfs_password: ~
\ No newline at end of file
+gcfs_password: ~
+gpg_sign_id: ~
+official_name: ~
+official_email: ~
\ No newline at end of file
diff --git a/roles/bootstrap/defaults/options/certbot.yml b/roles/bootstrap/defaults/options/certbot.yml
new file mode 100644
index 0000000..1e5f653
--- /dev/null
+++ b/roles/bootstrap/defaults/options/certbot.yml
@@ -0,0 +1,3 @@
+---
+dns_secret: ~
+dns_key: ~
\ No newline at end of file
diff --git a/roles/bootstrap/defaults/options/crowdsec.yml b/roles/bootstrap/defaults/options/crowdsec.yml
new file mode 100644
index 0000000..678e3cb
--- /dev/null
+++ b/roles/bootstrap/defaults/options/crowdsec.yml
@@ -0,0 +1,2 @@
+---
+enrollment_key: ~
\ No newline at end of file
diff --git a/roles/bootstrap/defaults/options/git.yml b/roles/bootstrap/defaults/options/git.yml
new file mode 100644
index 0000000..dc37218
--- /dev/null
+++ b/roles/bootstrap/defaults/options/git.yml
@@ -0,0 +1,4 @@
+---
+gpg_sign_id: ~
+official_name: ~
+official_email: ~
\ No newline at end of file
diff --git a/roles/bootstrap/defaults/options/gpg.yml b/roles/bootstrap/defaults/options/gpg.yml
new file mode 100644
index 0000000..945b5aa
--- /dev/null
+++ b/roles/bootstrap/defaults/options/gpg.yml
@@ -0,0 +1,2 @@
+---
+gcfs_password: ~
\ No newline at end of file
diff --git a/roles/bootstrap/defaults/options/proftpd.yml b/roles/bootstrap/defaults/options/proftpd.yml
new file mode 100644
index 0000000..c8058f0
--- /dev/null
+++ b/roles/bootstrap/defaults/options/proftpd.yml
@@ -0,0 +1,16 @@
+---
+welcome_msg_path: /etc/proftpd/welcome.msg
+goodbye_msg_path: /etc/proftpd/bye.msg
+transfer_msg_path: /etc/proftpd/transfer.msg
+default_umask: 0022 0022
+users_allowed: root
+servername: ~
+admin_email: ~
+serveralias: localhost
+ftp_protocols: ftps
+ftp_port: 990
+sec_cert_path: /etc/srv/domain.cert.pem
+sca_cert_path: /etc/srv/domain.cert.pem
+key_cert_path: /etc/srv/private.key.pem
+ftp_auth_user_path: /etc/proftpd/ftp.passwd
+ftp_auth_group_path: /etc/proftpd/ftpd.group
\ No newline at end of file
diff --git a/roles/bootstrap/defaults/options/ssh.yml b/roles/bootstrap/defaults/options/ssh.yml
new file mode 100644
index 0000000..5ab549d
--- /dev/null
+++ b/roles/bootstrap/defaults/options/ssh.yml
@@ -0,0 +1,5 @@
+---
+pubkeys: ~
+primary_root_acct: ~
+nonlogin_method: ~
+roots: ~
\ No newline at end of file