diff --git a/.gitignore b/.gitignore
index b9c4d0bd..b3ff12e5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,3 +6,9 @@ inventory
 roles
 *.retry
 *.log
+
+# Vim
+[._]sw[a-p]
+
+# Session
+Session.vim
diff --git a/group_vars/all.yml.dist b/group_vars/all.yml.dist
index 8ce736f8..0829a6ec 100644
--- a/group_vars/all.yml.dist
+++ b/group_vars/all.yml.dist
@@ -66,6 +66,9 @@ ansible_nas_email: me@example.com
 # Applications will have subdomain SSL certificates created, eg ansible-nas.<your-domain>, nextcloud.<your-domain>
 ansible_nas_domain: example.com
 
+# Install extra packages
+ansible_nas_extra_packages: ['smartmontools', 'htop', 'zfsutils-linux', 'bonnie++', 'unzip', 'lm-sensors']
+
 ###
 ### Docker
 ###
diff --git a/tasks/general.yml b/tasks/general.yml
index 7bc462be..02e41191 100644
--- a/tasks/general.yml
+++ b/tasks/general.yml
@@ -21,7 +21,7 @@
 
 - name: Install some packages
   apt:
-    name: ['smartmontools', 'htop', 'zfsutils-linux', 'bonnie++', 'unzip', 'lm-sensors']
+    name: "{{ ansible_nas_extra_packages }}"
     state: present
   register: result
   until: result is succeeded
diff --git a/tests/test.yml b/tests/test.yml
index 6b77bd42..f8805268 100644
--- a/tests/test.yml
+++ b/tests/test.yml
@@ -66,6 +66,9 @@ ansible_nas_email: me@example.com
 # Applications will have subdomain SSL certificates created, eg ansible-nas.<your-domain>, nextcloud.<your-domain>
 ansible_nas_domain: example.com
 
+# Install extra packages
+ansible_nas_extra_packages: ['smartmontools', 'htop', 'zfsutils-linux', 'bonnie++', 'unzip', 'lm-sensors']
+
 ###
 ### Docker
 ###