diff --git a/playbook.yml b/playbook.yml
index c59d750..13a7552 100644
--- a/playbook.yml
+++ b/playbook.yml
@@ -20,6 +20,7 @@
     - { role: iptables, tags: ['iptables'] }
     - { role: nettools, tags: ['nettools'] }
     - { role: networkmanager, tags: ['networkmanager'] }
+    - { role: nmtrust, tags: ['nmtrust'] }
     - { role: macchiato, tags: ['macchiato'] }
     - { role: ntp, tags: ['ntp'] }
     - { role: firejail, tags: ['firejail'] }
diff --git a/roles/bitlbee/meta/main.yml b/roles/bitlbee/meta/main.yml
index d5970b2..041a945 100644
--- a/roles/bitlbee/meta/main.yml
+++ b/roles/bitlbee/meta/main.yml
@@ -1,6 +1,6 @@
 ---
 dependencies:
-  - { role: networkmanager }
+  - { role: nmtrust }
   - { role: firejail }
   - { role: systemd }
   - { role: tor }
diff --git a/roles/git-annex/meta/main.yml b/roles/git-annex/meta/main.yml
index 2972623..371455c 100644
--- a/roles/git-annex/meta/main.yml
+++ b/roles/git-annex/meta/main.yml
@@ -1,5 +1,5 @@
 ---
 dependencies:
-  - { role: networkmanager }
+  - { role: nmtrust }
   - { role: systemd }
   - { role: sysctl }
diff --git a/roles/localtime/meta/main.yml b/roles/localtime/meta/main.yml
index eb76ade..49c0cc6 100644
--- a/roles/localtime/meta/main.yml
+++ b/roles/localtime/meta/main.yml
@@ -1,3 +1,3 @@
 ---
 dependencies:
-  - { role: networkmanager }
+  - { role: nmtrust }
diff --git a/roles/mail/meta/main.yml b/roles/mail/meta/main.yml
index 2915940..40c1633 100644
--- a/roles/mail/meta/main.yml
+++ b/roles/mail/meta/main.yml
@@ -1,6 +1,6 @@
 ---
 dependencies:
-  - { role: networkmanager }
+  - { role: nmtrust }
   - { role: systemd }
   - { role: cron }
   - { role: firejail }
diff --git a/roles/mirrorlist/meta/main.yml b/roles/mirrorlist/meta/main.yml
index 54f727d..6b0addd 100644
--- a/roles/mirrorlist/meta/main.yml
+++ b/roles/mirrorlist/meta/main.yml
@@ -1,4 +1,4 @@
 ---
 dependencies:
-  - { role: networkmanager }
+  - { role: nmtrust }
   - { role: systemd }
diff --git a/roles/networkmanager/tasks/main.yml b/roles/networkmanager/tasks/main.yml
index fc3dec8..064f3c4 100644
--- a/roles/networkmanager/tasks/main.yml
+++ b/roles/networkmanager/tasks/main.yml
@@ -9,33 +9,19 @@
       - gnome-keyring
 
 - name: Push connectivity check config
-  template: src=connectivity.conf.j2 dest=/etc/NetworkManager/conf.d/20-connectivity.conf
+  template:
+      src: connectivity.conf.j2
+      dest: /etc/NetworkManager/conf.d/20-connectivity.conf
   when: network.conn_check is defined
 
 - name: Enable and start NetworkManager
-  service: name=NetworkManager.service enabled=yes state=started
+  service:
+      name: NetworkManager.service
+      enabled: yes
+      state: started
 
 - name: Enable and start NetworkManager dispatcher
-  service: name=NetworkManager-dispatcher.service enabled=yes state=started
-
-- name: Install nmtrust
-  aur:
-      name: nmtrust-git
-      user: "{{ user.name }}"
-  tags:
-    - aur
-
-- name: Create nmtrust config directory
-  file:
-      path: /etc/nmtrust
-      state: directory
-
-- name: Push trusted network list
-  template:
-      src: trusted_networks.j2
-      dest: /etc/nmtrust/trusted_networks
-
-- name: Verify trusted unit list exists
-  file:
-      path: /etc/trusted_units
-      state: touch
+  service:
+      name: NetworkManager-dispatcher.service
+      enabled: yes
+      state: started
diff --git a/roles/nmtrust/meta/main.yml b/roles/nmtrust/meta/main.yml
new file mode 100644
index 0000000..eb76ade
--- /dev/null
+++ b/roles/nmtrust/meta/main.yml
@@ -0,0 +1,3 @@
+---
+dependencies:
+  - { role: networkmanager }
diff --git a/roles/nmtrust/tasks/main.yml b/roles/nmtrust/tasks/main.yml
new file mode 100644
index 0000000..8b14620
--- /dev/null
+++ b/roles/nmtrust/tasks/main.yml
@@ -0,0 +1,22 @@
+---
+- name: Install nmtrust
+  aur:
+      name: nmtrust-git
+      user: "{{ user.name }}"
+  tags:
+    - aur
+
+- name: Create nmtrust config directory
+  file:
+      path: /etc/nmtrust
+      state: directory
+
+- name: Push trusted network list
+  template:
+      src: trusted_networks.j2
+      dest: /etc/nmtrust/trusted_networks
+
+- name: Verify trusted unit list exists
+  file:
+      path: /etc/nmtrust/trusted_units
+      state: touch
diff --git a/roles/networkmanager/templates/trusted_networks.j2 b/roles/nmtrust/templates/trusted_networks.j2
similarity index 100%
rename from roles/networkmanager/templates/trusted_networks.j2
rename to roles/nmtrust/templates/trusted_networks.j2
diff --git a/roles/tarsnap/meta/main.yml b/roles/tarsnap/meta/main.yml
index 3be8ed9..4b2c4e6 100644
--- a/roles/tarsnap/meta/main.yml
+++ b/roles/tarsnap/meta/main.yml
@@ -1,5 +1,5 @@
 ---
 dependencies:
   - { role: virtualenv }
-  - { role: networkmanager }
+  - { role: nmtrust }
   - { role: backitup }
diff --git a/roles/tor/meta/main.yml b/roles/tor/meta/main.yml
index cdc5be9..be1a786 100644
--- a/roles/tor/meta/main.yml
+++ b/roles/tor/meta/main.yml
@@ -2,4 +2,4 @@
 dependencies:
   - { role: firejail }
   - { role: systemd }
-  - { role: networkmanager }
+  - { role: nmtrust }