diff --git a/host_vars/dell.yml b/host_vars/dell.yml
index 48f9e9e..2a55913 100644
--- a/host_vars/dell.yml
+++ b/host_vars/dell.yml
@@ -67,3 +67,4 @@ cron_hour: "4"
 #    - "unix:///var/run/docker.sock"
 
 docker_backup_host_backup_directory: "/tmp"
+portainer_roles: []
diff --git a/host_vars/qnap.yml b/host_vars/qnap.yml
index 6fe9859..a10ff3e 100644
--- a/host_vars/qnap.yml
+++ b/host_vars/qnap.yml
@@ -95,4 +95,10 @@ services:
   - name: gotify
   - name: diun
 
+portainer_roles:
+  - role: portainer_dashy
+  - role: portainer_dashdot
+  - role: portainer_glances
+  - role: portainer_arr
+
 
diff --git a/host_vars/snunmu.yml b/host_vars/snunmu.yml
index a574a56..88081c9 100644
--- a/host_vars/snunmu.yml
+++ b/host_vars/snunmu.yml
@@ -27,3 +27,10 @@ docker_daemon_options:
     - "tcp://0.0.0.0:2375"
     - "unix:///var/run/docker.sock"
 
+
+portainer_roles:
+  - role: portainer_bookstack
+  - role: portainer_vaultwarden
+  - role: portainer_dashy
+  - role: portainer_dashdot
+  - role: portainer_glances
diff --git a/playbooks/setup-homelab.yml b/playbooks/setup-homelab.yml
index 0d12f12..849697e 100644
--- a/playbooks/setup-homelab.yml
+++ b/playbooks/setup-homelab.yml
@@ -55,35 +55,20 @@
     - role: setup_compose_services
       tags: [compose]
 
-
-- name: Setup and deploy portainer services (snunmu).
-  hosts: snunmu
-  become: true
-  tags: [services]
-  pre_tasks:
-    - name: Include vault variables.
-      ansible.builtin.include_vars: '../{{ vault_file }}'
-      tags: [always]
-  roles:
-    - role: portainer_bookstack
-    - role: portainer_vaultwarden
-    - role: portainer_dashy
-    - role: portainer_dashdot
-    - role: portainer_glances
-
-- name: Setup and deploy portainer services (qnap).
-  hosts: qnap
+- name: Setup and deploy portainer services.
+  hosts: servers
   become: true
+  strategy: free
   tags: [services]
   pre_tasks:
     - name: Include vault variables.
       ansible.builtin.include_vars: '../{{ vault_file }}'
       tags: [always]
-  roles:
-    - role: portainer_dashy
-    - role: portainer_dashdot
-    - role: portainer_glances
-    - role: portainer_arr
+  tasks:
+    - name: Setup and deploy portainer services.
+      include_role:
+        name: "{{ item.role }}"
+      with_items:  "{{ portainer_roles }}"
 
 #
 #- name: Setup and deploy templated portainer services.
diff --git a/roles/setup_hosted_services/files/olivetin/config.yml b/roles/setup_hosted_services/files/olivetin/config.yml
index 07e5740..5beaf0e 100644
--- a/roles/setup_hosted_services/files/olivetin/config.yml
+++ b/roles/setup_hosted_services/files/olivetin/config.yml
@@ -11,8 +11,8 @@ actions:
     timeout: 30
   - title: Restart Overseerr
     icon: overseerr
-    shell: docker restart plex
+    shell: docker restart overseerr
     timeout: 30
   - title: Restart VPN Stack
-    shell: docker restart surfshark sonarr radarr jackett qbittorrent
+    shell: docker restart protonvpn sonarr radarr jackett qbittorrent
     timeout: 90