diff --git a/playbook.yml b/playbook.yml
index 2e11e030..0b32134e 100644
--- a/playbook.yml
+++ b/playbook.yml
@@ -1,10 +1,15 @@
 ---
-- name: general host setup
-  hosts: all
+- name:   general setup
+  hosts:  all
+  become: true
+  roles:
+    - independent_system-update
+
+- name: servers host setup
+  hosts: servers
   become: true
   roles:
     - system-security
-    - system-update
     - native-journalctl
     - native-disc-space-check
     - native-free-disc-space
@@ -174,10 +179,9 @@
 
 ## PC services
 - name: general host setup
-  hosts: all
+  hosts: personal_computers
   become: true
   roles:
-    - system-pacman
     - pc_collection-administrator-base
     - pc_driver-non-free
 
diff --git a/roles/server_native-apt-update/README.md b/roles/independent-system-apt-update/README.md
similarity index 80%
rename from roles/server_native-apt-update/README.md
rename to roles/independent-system-apt-update/README.md
index 97befe80..b53e4086 100644
--- a/roles/server_native-apt-update/README.md
+++ b/roles/independent-system-apt-update/README.md
@@ -1,4 +1,4 @@
-# role native-apt-update
+# role independent-system-apt-update
 This role updates the packages
 
 # upgrade
diff --git a/roles/server_native-apt-update/tasks/main.yml b/roles/independent-system-apt-update/tasks/main.yml
similarity index 100%
rename from roles/server_native-apt-update/tasks/main.yml
rename to roles/independent-system-apt-update/tasks/main.yml
diff --git a/roles/pc_system-pacman/tasks/main.yml b/roles/independent-system-pacman/tasks/main.yml
similarity index 100%
rename from roles/pc_system-pacman/tasks/main.yml
rename to roles/independent-system-pacman/tasks/main.yml
diff --git a/roles/independent_system-update/meta/main.yml b/roles/independent_system-update/meta/main.yml
new file mode 100644
index 00000000..11b6128f
--- /dev/null
+++ b/roles/independent_system-update/meta/main.yml
@@ -0,0 +1,3 @@
+dependencies:
+  - { role: independent-system-pacman, when: ansible_distribution == 'Archlinux' }
+  - { role: independent-system-apt-update, when: ansible_distribution == "Debian" }
diff --git a/roles/server_native-pacman-update/tasks/main.yml b/roles/server_native-pacman-update/tasks/main.yml
deleted file mode 100644
index f7285d6f..00000000
--- a/roles/server_native-pacman-update/tasks/main.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-- name: update pacman
-  pacman:
-    update_cache: yes
-    upgrade: yes
diff --git a/roles/server_system-update/meta/main.yml b/roles/server_system-update/meta/main.yml
deleted file mode 100644
index febaaf1f..00000000
--- a/roles/server_system-update/meta/main.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-dependencies:
-  - { role: native-pacman-update, when: ansible_distribution == 'Archlinux' }
-  - { role: native-apt-update, when: ansible_distribution == "Debian" }