diff --git a/Vagrantfile b/Vagrantfile
index 5857d47..2112f6b 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -45,7 +45,7 @@ Vagrant.configure("2") do |config|
   config.vm.provision "ansible" do |ansible|
     ENV['ANSIBLE_ROLES_PATH'] = File.dirname(__FILE__) + "/roles"
     ansible.compatibility_mode = "2.0"
-    ansible.playbook = "site-vagrant.yml"
-    ansible.raw_arguments  = ["--diff"]
+    ansible.playbook = "dev/workstation.yml"
+    ansible.raw_arguments = ["--diff"]
   end
 end
diff --git a/inventory.yml b/dev/inventory.yml
similarity index 100%
rename from inventory.yml
rename to dev/inventory.yml
diff --git a/site-vagrant.yml b/dev/workstation.yml
similarity index 100%
rename from site-vagrant.yml
rename to dev/workstation.yml
diff --git a/roles/common/defaults/main.yml b/roles/common/defaults/main.yml
index 5f852da..b6d53a2 100644
--- a/roles/common/defaults/main.yml
+++ b/roles/common/defaults/main.yml
@@ -1,4 +1,5 @@
 darkmode: false
+development: false
 homedir: "/home/{{ item.name }}"
 
 # Follows homelab package list:
diff --git a/roles/common/tasks/development.yml b/roles/common/tasks/development.yml
index c9595ea..4a112cf 100644
--- a/roles/common/tasks/development.yml
+++ b/roles/common/tasks/development.yml
@@ -3,4 +3,3 @@
     name: vagrant
     password: "$6$xu0I8bbf.Nva7uCo$OHz5/64u0SjHa1jn0EwCLSNw7Zoj5ejhL\
                6NtaXYY6zlC0CQa0J4kZIxAp2Ls4lMdLmuo7oMQX/vlDucR9BbcA."
-
diff --git a/roles/common/tasks/gui.yml b/roles/common/tasks/gui.yml
index b551ec6..174d615 100644
--- a/roles/common/tasks/gui.yml
+++ b/roles/common/tasks/gui.yml
@@ -5,16 +5,17 @@
     update_cache: true
 
 - name: Create autostart-scripts directory
-  file:
+  ansible.builtin.file:
     path: "{{ homedir }}/.config/autostart-scripts/"
     state: directory
     owner: "{{ item.name }}"
     group: "{{ item.name }}"
+    mode: 0700
   loop: "{{ users }}"
   when: manage_gui
 
 - name: Enable KDE dark theme
-  copy:
+  ansible.builtin.copy:
     dest: "{{ homedir }}/.config/autostart-scripts/darkmode.sh"
     mode: a+x
     content: |
diff --git a/roles/common/tasks/system.yml b/roles/common/tasks/system.yml
index b342cf3..b4d4c16 100644
--- a/roles/common/tasks/system.yml
+++ b/roles/common/tasks/system.yml
@@ -9,7 +9,7 @@
     name: "{{ item.name }}"
     state: present
     groups: "{{ item.groups }}"
-    append: yes
+    append: true
     shell: "{{ item.shell | default('/bin/bash') }}"
     create_home: "{{ item.home | default(false) }}"
   loop: "{{ users }}"
diff --git a/workstation.yml b/workstation.yml
new file mode 100644
index 0000000..4d46677
--- /dev/null
+++ b/workstation.yml
@@ -0,0 +1,5 @@
+- name: Install Workstation
+  hosts: localhost
+  become: true
+  roles:
+    - common