diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index ab6af0dcefc727ba386529569ba4ae33dfbe73f0..38dca35d4904f40ba28bcdbcf83abc9e4ce774a2 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -45,7 +45,8 @@ repos:
     rev: v0.10.0
     hooks:
       - id: ansible-syntax-check
-        files: (bootstrap|update|renew-certs|debian_server|kodi)\.yaml
+        # yamllint disable-line rule:line-length
+        files: (bootstrap|update|renew-certs|debian_server|kodi|router)\.yaml
 
   - repo: https://github.com/ansible/ansible-lint
     rev: v4.3.7
diff --git a/bootstrap.yaml b/bootstrap.yaml
index 62a1a8d65f88645779e2e1d7df93fabe73240cc7..362472242130d097e7a13a5eede85ec018f20c2c 100644
--- a/bootstrap.yaml
+++ b/bootstrap.yaml
@@ -1,17 +1,8 @@
 ---
-- name: Group hosts by package manager
-  hosts:
-    - all
-  tasks:
-    - name: Group hosts by package manager
-      group_by:
-        key: pkg_mgr_{{ ansible_pkg_mgr }}
-      tags:
-        - always
-
 - name: Bootstrap Debian hosts
   hosts:
-    - pkg_mgr_apt
+    - host01
+    - ns4
   tags:
     - debian
     - update
@@ -21,7 +12,7 @@
 
 - name: Bootstrap OpenWRT hosts
   hosts:
-    - pkg_mgr_opkg
+    - ea6350
   tags:
     - openwrt
     - update
@@ -31,7 +22,7 @@
 
 - name: Bootstrap OpenBSD hosts
   hosts:
-    - pkg_mgr_openbsd_pkg
+    - ns1
   tags:
     - openbsd
     - update
diff --git a/debian_server.yaml b/debian_server.yaml
index 08e53da2c957f58aea7c81aa9e278de4eb5a113e..cc881ea6c47c9ac2dcdd7ef31dcb67966bfb9095 100644
--- a/debian_server.yaml
+++ b/debian_server.yaml
@@ -5,5 +5,4 @@
     - ns4
   roles:
     - debian_server
-  become: true
-  become_user: root
+    - toolbox
diff --git a/hosts/all.yaml b/hosts/all.yaml
index bde70e2637d62ffcd8d00a44f7af777ce118cfe6..fc76f7d771ac277aeff0aad5d5cad56983d50031 100644
--- a/hosts/all.yaml
+++ b/hosts/all.yaml
@@ -16,8 +16,10 @@ all:
       ansible_host: host01.shore.co.il
   vars:
     # Force usage of Python3.
-    ansible_python_interpreter: python3
+    ansible_become: true
+    ansible_become_user: root
     ansible_connection: ssh
+    ansible_python_interpreter: python3
   children:
     pkg_mgr_apt:
     pkg_mgr_opkg:
diff --git a/kodi.yaml b/kodi.yaml
index c8c05116195b9190c685e26583d0a3cdade1de84..0adcc9e4e7c6d3ac11e4c3c2119f8d80c3c3864e 100644
--- a/kodi.yaml
+++ b/kodi.yaml
@@ -3,5 +3,3 @@
     - kodi
   roles:
     - kodi
-  become: true
-  become_user: root
diff --git a/router.yaml b/router.yaml
index 69b6e43a0bb4044d951854980e71a25d0da3261f..2a10d12a139e06c17120d95e39331f763d1ad938 100644
--- a/router.yaml
+++ b/router.yaml
@@ -3,5 +3,3 @@
     - ns1
   roles:
     - router
-  become: true
-  become_user: root
diff --git a/toolbox.yaml b/toolbox.yaml
deleted file mode 100644
index 933c425777882299fe3c95fb4c8338896571ca35..0000000000000000000000000000000000000000
--- a/toolbox.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-- hosts:
-    - ns4
-    - localhost
-  roles:
-    - toolbox
-  become: true
-  become_user: root