diff --git a/roles/browsers/files/firejail/chromium.profile b/roles/browsers/files/firejail/chromium.profile
index 30d2b4a..b6f05eb 100644
--- a/roles/browsers/files/firejail/chromium.profile
+++ b/roles/browsers/files/firejail/chromium.profile
@@ -1,4 +1,3 @@
-include /usr/local/etc/firejail/disable-more.inc
 include /etc/firejail/chromium.profile
 
 # Note that localtime should be added to private-etc if you wish Chromium to be
diff --git a/roles/browsers/files/firejail/firefox.profile b/roles/browsers/files/firejail/firefox.profile
index 42abd46..d9a0b21 100644
--- a/roles/browsers/files/firejail/firefox.profile
+++ b/roles/browsers/files/firejail/firefox.profile
@@ -1,4 +1,3 @@
-include /usr/local/etc/firejail/disable-more.inc
 include /etc/firejail/firefox.profile
 
 # Note that localtime should be added to private-etc if you wish Firefox to be
diff --git a/roles/firejail/files/generic.profile b/roles/firejail/files/generic.profile
index d9a73cd..c9dc520 100644
--- a/roles/firejail/files/generic.profile
+++ b/roles/firejail/files/generic.profile
@@ -1,4 +1,2 @@
 include /etc/firejail/default.profile
 include /etc/firejail/disable-devel.inc
-
-include /usr/local/etc/firejail/disable-more.inc
diff --git a/roles/mail/files/firejail/mutt.profile b/roles/mail/files/firejail/mutt.profile
index bf91d26..086f6e3 100644
--- a/roles/mail/files/firejail/mutt.profile
+++ b/roles/mail/files/firejail/mutt.profile
@@ -1,4 +1,3 @@
-noblacklist ~/.msmtprc
 noblacklist ~/.config/vdirsyncer
 noblacklist ~/.vdirsyncer
 noblacklist ~/.calendars
@@ -7,5 +6,4 @@ noblacklist ~/.mbsyncrc
 noblacklist ~/.offlineimap
 noblacklist ~/.offlineimaprc
 
-include /usr/local/etc/firejail/disable-more.inc
 include /etc/firejail/mutt.profile
diff --git a/roles/mpd/files/firejail/mpd.profile b/roles/mpd/files/firejail/mpd.profile
index f8206fd..dcb0c91 100644
--- a/roles/mpd/files/firejail/mpd.profile
+++ b/roles/mpd/files/firejail/mpd.profile
@@ -1,4 +1,4 @@
-include /usr/local/etc/firejail/disable-more.inc
+include /etc/firejail/globals.local
 include /etc/firejail/disable-devel.inc
 include /etc/firejail/disable-common.inc
 include /etc/firejail/disable-programs.inc
diff --git a/roles/mpv/files/firejail/mpv.profile b/roles/mpv/files/firejail/mpv.profile
deleted file mode 100644
index b71e555..0000000
--- a/roles/mpv/files/firejail/mpv.profile
+++ /dev/null
@@ -1,5 +0,0 @@
-include /etc/firejail/mpv.profile
-include /usr/local/etc/firejail/disable-more.inc
-
-private-etc firejail,group,hosts,resolv.conf,mime.types,asound.conf,pulse,fonts,ssl,ca-certificates
-private-bin mpv,youtube-dl,python,python2.7,python3.6
diff --git a/roles/mpv/tasks/main.yml b/roles/mpv/tasks/main.yml
index a1f96a4..5c08ea4 100644
--- a/roles/mpv/tasks/main.yml
+++ b/roles/mpv/tasks/main.yml
@@ -9,12 +9,5 @@
   tags:
     - firejail
 
-- name: Push mpv firejail profile
-  copy: src=firejail/mpv.profile dest=/usr/local/etc/firejail/mpv.profile
-  notify:
-    - activate firejail profiles
-  tags:
-    - firejail
-
 - name: Push play script
   copy: src=play.sh dest=/usr/local/bin/play mode=0755
diff --git a/roles/office/files/firejail/libreoffice.profile b/roles/office/files/firejail/libreoffice.profile
index 62fbea6..42de32a 100644
--- a/roles/office/files/firejail/libreoffice.profile
+++ b/roles/office/files/firejail/libreoffice.profile
@@ -1,6 +1,4 @@
-include /usr/local/etc/firejail/disable-more.inc
 include /etc/firejail/libreoffice.profile
 
 net none
 private-etc firejail,libreoffice,fonts,passwd
-shell none
diff --git a/roles/office/files/firejail/zathura.profile b/roles/office/files/firejail/zathura.profile
deleted file mode 100644
index 152eae9..0000000
--- a/roles/office/files/firejail/zathura.profile
+++ /dev/null
@@ -1,4 +0,0 @@
-include /usr/local/etc/firejail/disable-more.inc
-include /etc/firejail/zathura.profile
-
-net none
diff --git a/roles/office/tasks/main.yml b/roles/office/tasks/main.yml
index 4baaa94..f79e7b5 100644
--- a/roles/office/tasks/main.yml
+++ b/roles/office/tasks/main.yml
@@ -35,13 +35,6 @@
   tags:
     - firejail
 
-- name: Push Zathura firejail profile
-  copy: src=firejail/zathura.profile dest=/usr/local/etc/firejail/zathura.profile
-  notify:
-    - activate firejail profiles
-  tags:
-    - firejail
-
 - name: Install enscript
   pacman: name=enscript state=present
 
diff --git a/roles/rtorrent/files/firejail/rtorrent.profile b/roles/rtorrent/files/firejail/rtorrent.profile
deleted file mode 100644
index 6a31feb..0000000
--- a/roles/rtorrent/files/firejail/rtorrent.profile
+++ /dev/null
@@ -1,6 +0,0 @@
-include /usr/local/etc/firejail/disable-more.inc
-include /etc/firejail/rtorrent.profile
-
-private-dev
-private-etc firejail,passwd,group,hostname,hosts,nsswitch.conf,resolv.conf
-private-tmp
diff --git a/roles/rtorrent/tasks/main.yml b/roles/rtorrent/tasks/main.yml
index d334fa3..591207d 100644
--- a/roles/rtorrent/tasks/main.yml
+++ b/roles/rtorrent/tasks/main.yml
@@ -8,10 +8,3 @@
         state=link
   tags:
     - firejail
-
-- name: Push rtorrent firejail profile
-  copy: src=firejail/rtorrent.profile dest=/usr/local/etc/firejail/rtorrent.profile
-  notify:
-    - activate firejail profiles
-  tags:
-    - firejail
diff --git a/roles/weechat/files/firejail/weechat.profile b/roles/weechat/files/firejail/weechat.profile
deleted file mode 100644
index cd93212..0000000
--- a/roles/weechat/files/firejail/weechat.profile
+++ /dev/null
@@ -1,3 +0,0 @@
-noblacklist ${HOME}/.weechat
-include /usr/local/etc/firejail/disable-more.inc
-include /etc/firejail/default.profile
diff --git a/roles/weechat/tasks/main.yml b/roles/weechat/tasks/main.yml
index 8055795..7426483 100644
--- a/roles/weechat/tasks/main.yml
+++ b/roles/weechat/tasks/main.yml
@@ -9,12 +9,5 @@
   tags:
     - firejail
 
-- name: Push weechat firejail profile
-  copy: src=firejail/weechat.profile dest=/usr/local/etc/firejail/weechat.profile
-  notify:
-    - activate firejail profiles
-  tags:
-    - firejail
-
 - name: Install dunst
   pacman: name=dunst state=present