diff --git a/ansible/linter.yaml b/ansible/linter.yaml
index 5b49ae0..8e40f41 100644
--- a/ansible/linter.yaml
+++ b/ansible/linter.yaml
@@ -1,4 +1,7 @@
 ---
 skip_list:
-    - role-name
-    - var-naming[no-role-prefix]
+  - role-name
+  - var-naming[no-role-prefix]
+exclude_paths:
+  - linter.yaml
+  - inventory.yaml
diff --git a/ansible/local-setup-admin-user.yaml b/ansible/playbook/local-setup-admin-user.yaml
similarity index 100%
rename from ansible/local-setup-admin-user.yaml
rename to ansible/playbook/local-setup-admin-user.yaml
diff --git a/ansible/nomad.yaml b/ansible/playbook/nomad.yaml
similarity index 99%
rename from ansible/nomad.yaml
rename to ansible/playbook/nomad.yaml
index 20459b9..797ff65 100644
--- a/ansible/nomad.yaml
+++ b/ansible/playbook/nomad.yaml
@@ -6,4 +6,3 @@
     - name: Apply the nomad role
       ansible.builtin.include_role:
         name: nomad
-
diff --git a/ansible/nuc.yaml b/ansible/playbook/nuc.yaml
similarity index 100%
rename from ansible/nuc.yaml
rename to ansible/playbook/nuc.yaml
diff --git a/ansible/proxy.yaml b/ansible/playbook/proxy.yaml
similarity index 100%
rename from ansible/proxy.yaml
rename to ansible/playbook/proxy.yaml
diff --git a/ansible/roles/base/tasks/ensure-docker-basic.yaml b/ansible/roles/base/tasks/ensure-docker-basic.yaml
index bdfd365..3402a9b 100644
--- a/ansible/roles/base/tasks/ensure-docker-basic.yaml
+++ b/ansible/roles/base/tasks/ensure-docker-basic.yaml
@@ -8,8 +8,8 @@
 - name: Running install on the keyrings directory
   ansible.builtin.command:
     cmd: install -m 0755 -d /etc/apt/keyrings
-  register: install
-  changed_when: install.rc == 0
+  register: base_install_keyrings
+  changed_when: base_install_keyrings.rc == 0
 - name: Fetch Docker GPG Key
   vars:
     keylink: https://download.docker.com/linux/ubuntu/gpg
@@ -37,5 +37,5 @@
 - name: Verify that the docker components are installed properly
   ansible.builtin.command:
     cmd: docker run hello-world
-  register: docker
-  changed_when: docker.rc == 0
+  register: base_docker_hello
+  changed_when: base_docker_hello.rc == 0
diff --git a/ansible/roles/base/tasks/k3s.yaml b/ansible/roles/base/tasks/k3s.yaml
index 0aad994..295d7f1 100644
--- a/ansible/roles/base/tasks/k3s.yaml
+++ b/ansible/roles/base/tasks/k3s.yaml
@@ -6,3 +6,5 @@
 - name: Run installation script
   ansible.builtin.command:
     cmd: bash /tmp/k3s.sh
+  register: base_k3s_install_script
+  changed_when: base_k3_install_script.rc == 0
diff --git a/ansible/roles/base/tasks/main.yaml b/ansible/roles/base/tasks/main.yaml
index 56e5c91..dc15970 100644
--- a/ansible/roles/base/tasks/main.yaml
+++ b/ansible/roles/base/tasks/main.yaml
@@ -15,11 +15,3 @@
       become: true
       tags:
         - setup
-- name: Run through nomad removal steps
-  tags: nomad
-  ansible.builtin.include_tasks:
-    file: nomad.yaml
-    apply:
-      become: true
-      tags:
-        - nomad
diff --git a/ansible/roles/k3s/tasks/main.yaml b/ansible/roles/k3s/tasks/main.yaml
index bdcbf59..33d4853 100644
--- a/ansible/roles/k3s/tasks/main.yaml
+++ b/ansible/roles/k3s/tasks/main.yaml
@@ -2,10 +2,13 @@
   ansible.builtin.get_url:
     url: https://get.k3s.io
     dest: /tmp
-  register: install_script
+    mode: "0644"
+  register: k3s_dl_install_script
 - name: Run installation script
   become: true
   environment:
-      INSTALL_K3S_EXEC: server
+    INSTALL_K3S_EXEC: server
   ansible.builtin.command:
-    cmd: sh {{ install_script.dest }}
\ No newline at end of file
+    cmd: sh {{ k3s_dl_install_script.dest }}
+  register: k3s_install_script
+  changed_when: k3s_install_script.rc == 0
diff --git a/ansible/roles/nomad/tasks/main.yaml b/ansible/roles/nomad/tasks/main.yaml
index 8e540f8..4f4bc00 100644
--- a/ansible/roles/nomad/tasks/main.yaml
+++ b/ansible/roles/nomad/tasks/main.yaml
@@ -1,18 +1,18 @@
 - name: Nomad server configuration
-  become:  true
+  become: true
   block:
     - name: Ensure the root data directory is present
       ansible.builtin.file:
-        path: "{{ nomad.volumes.root }}"
+        path: "{{ nomad_data.volumes.root }}"
         state: absent
         mode: "0755"
     - name: Ensure registry volume is present
       ansible.builtin.file:
-        path: "{{ nomad.volumes.registry }}"
+        path: "{{ nomad_data.volumes.registry }}"
         state: absent
         mode: "0755"
     - name: Ensure the MinIO diretory is present
       ansible.builtin.file:
-        path: "{{ nomad.volumes.nfs }}"
+        path: "{{ nomad_data.volumes.nfs }}"
         state: absent
         mode: "0755"
diff --git a/ansible/roles/nomad/vars/main.yaml b/ansible/roles/nomad/vars/main.yaml
index 4492a9e..25e7cdd 100644
--- a/ansible/roles/nomad/vars/main.yaml
+++ b/ansible/roles/nomad/vars/main.yaml
@@ -1,4 +1,4 @@
-nomad:
+nomad_data:
   volumes:
     root: /opt/volumes
     registry: /opt/volumes/ncr
diff --git a/ansible/roles/webserver/handlers/main.yaml b/ansible/roles/webserver/handlers/main.yaml
index e159329..2e159fc 100644
--- a/ansible/roles/webserver/handlers/main.yaml
+++ b/ansible/roles/webserver/handlers/main.yaml
@@ -1,4 +1,4 @@
 - name: Restart host to apply any changes and clear out uptime stuff
   become: true
   ansible.builtin.reboot:
-    msg: "Reboot initiated as a part of housekeeping"
\ No newline at end of file
+    msg: "Reboot initiated as a part of housekeeping"
diff --git a/ansible/roles/webserver/tasks/docker.yaml b/ansible/roles/webserver/tasks/docker.yaml
index e915dd5..8fb10fd 100644
--- a/ansible/roles/webserver/tasks/docker.yaml
+++ b/ansible/roles/webserver/tasks/docker.yaml
@@ -2,12 +2,16 @@
   become: true
   ansible.builtin.command:
     cmd: docker compose pull
-    chdir: "{{ webadmin.home }}/{{ item }}"
+    chdir: "{{ webserver_admin.home }}/{{ item }}"
   loop:
     - services
+  register: webserver_docker_pull
+  changed_when: webserver_docker_pull.rc == 0
 - name: Restart containers with newest container images
   ansible.builtin.command:
     cmd: docker compose up -d
-    chdir: "{{ webadmin.home }}/{{ item }}"
+    chdir: "{{ webserver_admin.home }}/{{ item }}"
   loop:
     - services
+  register: webserver_docker_restart
+  changed_when: webserver_docker_restart.rc == 0
diff --git a/ansible/roles/webserver/tasks/main.yaml b/ansible/roles/webserver/tasks/main.yaml
index b53910e..3d090dc 100644
--- a/ansible/roles/webserver/tasks/main.yaml
+++ b/ansible/roles/webserver/tasks/main.yaml
@@ -4,5 +4,5 @@
   ansible.builtin.apt:
     update_cache: true
     autoclean: true
-    autoremove:  true
-    upgrade: safe
\ No newline at end of file
+    autoremove: true
+    upgrade: safe
diff --git a/ansible/roles/webserver/vars/main.yaml b/ansible/roles/webserver/vars/main.yaml
index d2df270..750a2ff 100644
--- a/ansible/roles/webserver/vars/main.yaml
+++ b/ansible/roles/webserver/vars/main.yaml
@@ -1,2 +1,2 @@
-webadmin:
-  home: /home/webadmin
\ No newline at end of file
+webserver_admin:
+  home: /home/webadmin