diff --git a/roles/arch-boxes/tasks/main.yml b/roles/arch-boxes/tasks/main.yml
index 1dfadb701b23b54b914a6c54d93ec08b4e92e368..3fce9ab4b7ea79a1ca2d84c746126ccf06ff726b 100644
--- a/roles/arch-boxes/tasks/main.yml
+++ b/roles/arch-boxes/tasks/main.yml
@@ -37,6 +37,3 @@
 
 - name: start and enable arch-boxes timer
   service: name='arch-boxes.timer' enabled=yes state=started
-
-- name: enable systemd ressource accounting
-  command: systemctl set-property arch-boxes CPUAccounting=yes MemoryAccounting=yes
diff --git a/roles/borg-client/tasks/main.yml b/roles/borg-client/tasks/main.yml
index 704cdd990ee384493e73646b86fcc5e25bfcab12..6349dde085b39b22cb16161f91e03b448d364d46 100644
--- a/roles/borg-client/tasks/main.yml
+++ b/roles/borg-client/tasks/main.yml
@@ -61,6 +61,3 @@
 
 - name: activate systemd timers for backup
   service: name=borg-backup.timer enabled=yes state=started
-
-- name: enable systemd ressource accounting
-  command: systemctl set-property borg-backup CPUAccounting=yes MemoryAccounting=yes
diff --git a/roles/common/templates/system.conf.j2 b/roles/common/templates/system.conf.j2
index 1d498e74364142cc05c843743d68f0dfe97b11c6..e0eaeca0f5a12929ab8b59ead6bc58c49a859ac6 100644
--- a/roles/common/templates/system.conf.j2
+++ b/roles/common/templates/system.conf.j2
@@ -38,11 +38,11 @@
 #DefaultStartLimitIntervalSec=10s
 #DefaultStartLimitBurst=5
 #DefaultEnvironment=
-DefaultCPUAccounting=no
+DefaultCPUAccounting=yes
 DefaultIOAccounting=no
 DefaultIPAccounting=no
 DefaultBlockIOAccounting=no
-DefaultMemoryAccounting=no
+DefaultMemoryAccounting=yes
 DefaultTasksAccounting=yes
 #DefaultTasksMax=15%
 #DefaultLimitCPU=
diff --git a/roles/crond/tasks/main.yml b/roles/crond/tasks/main.yml
index aca98707e440c60e1a10e5c488543331806c0509..f49087e646e5829fe5dec1c9fee6dfad6b549593 100644
--- a/roles/crond/tasks/main.yml
+++ b/roles/crond/tasks/main.yml
@@ -6,6 +6,3 @@
 - name: activate cronie.service
   service: name=cronie enabled=yes state=started
 
-- name: enable systemd ressource accounting
-  command: systemctl set-property cronie CPUAccounting=yes MemoryAccounting=yes
-
diff --git a/roles/dbscripts/tasks/main.yml b/roles/dbscripts/tasks/main.yml
index c14416ff40bfd51ada76fab84f99c7c8feccdc11..75ee26213f617176f3ff594fa0c5b9b38c4e861f 100644
--- a/roles/dbscripts/tasks/main.yml
+++ b/roles/dbscripts/tasks/main.yml
@@ -225,9 +225,6 @@
 - name: start and enable rsync
   service: name=rsyncd.socket enabled=yes state=started
 
-- name: enable systemd ressource accounting
-  command: systemctl set-property system-rsyncd.slice CPUAccounting=yes MemoryAccounting=yes
-
 - name: open firewall holes for rsync
   firewalld: service=rsyncd permanent=true state=enabled
   when: configure_firewall
@@ -238,9 +235,6 @@
 - name: start and enable svnserve
   service: name=svnserve enabled=yes state=started
 
-- name: enable systemd ressource accounting
-  command: systemctl set-property svnserve CPUAccounting=yes MemoryAccounting=yes
-
 - name: open firewall holes for svnserve
   firewalld: port=3690/tcp permanent=true state=enabled
   when: configure_firewall
diff --git a/roles/dovecot/tasks/main.yml b/roles/dovecot/tasks/main.yml
index dda332780c507db75e1338678ae639fe826a79c0..99b43e15b181a562edede00e42d48633ca5597b5 100644
--- a/roles/dovecot/tasks/main.yml
+++ b/roles/dovecot/tasks/main.yml
@@ -17,9 +17,6 @@
 - name: start and enable dovecot
   service: name=dovecot enabled=yes state=started
 
-- name: enable systemd ressource accounting
-  command: systemctl set-property dovecot CPUAccounting=yes MemoryAccounting=yes
-
 - name: open firewall holes
   firewalld: service={{item}} permanent=true state=enabled
   with_items:
diff --git a/roles/flyspray/tasks/main.yml b/roles/flyspray/tasks/main.yml
index bce2cacdc8152eb9adb281745f3bc975cf04e63b..33787e90402ff923cc643409efb9f899a8ac91bc 100644
--- a/roles/flyspray/tasks/main.yml
+++ b/roles/flyspray/tasks/main.yml
@@ -59,6 +59,3 @@
 
 - name: start and enable systemd socket
   service: name=php-fpm@flyspray.socket state=started enabled=true
-
-- name: enable systemd ressource accounting
-  command: systemctl set-property php-fpm@flyspray CPUAccounting=yes MemoryAccounting=yes
diff --git a/roles/grafana/tasks/main.yml b/roles/grafana/tasks/main.yml
index 1fe78d78b331d14b859aa83706c999e411f1ad4f..59f1675160e623d4eb13d6bb04412d9f25fed7e0 100644
--- a/roles/grafana/tasks/main.yml
+++ b/roles/grafana/tasks/main.yml
@@ -21,6 +21,3 @@
 
 - name: start and enable service
   service: name=grafana state=started enabled=true
-
-- name: enable systemd ressource accounting
-  command: systemctl set-property grafana CPUAccounting=yes MemoryAccounting=yes
diff --git a/roles/kanboard/tasks/main.yml b/roles/kanboard/tasks/main.yml
index 4df3c502c8ca1d78897f3838364c472901d888d6..9b300674b8647aa65dbcbc71f73ba327aaa4bca8 100644
--- a/roles/kanboard/tasks/main.yml
+++ b/roles/kanboard/tasks/main.yml
@@ -48,9 +48,6 @@
 - name: start and enable systemd socket
   service: name=php-fpm@kanboard.socket state=started enabled=true
 
-- name: enable systemd ressource accounting
-  command: systemctl set-property php-fpm@kanboard CPUAccounting=yes MemoryAccounting=yes
-
 - name: install systemd timers for kanboard cronjob
   template: src={{ item }} dest=/etc/systemd/system/{{ item }} owner=root group=root mode=0644
   with_items:
diff --git a/roles/mariadb/tasks/main.yml b/roles/mariadb/tasks/main.yml
index 0fad28211c88651fb406c3f94368d76d5d6507e4..29f72724a711033d4470387eabdde42b69ffdb26 100644
--- a/roles/mariadb/tasks/main.yml
+++ b/roles/mariadb/tasks/main.yml
@@ -15,9 +15,6 @@
 - name: start and enable the service
   service: name=mariadb state=started enabled=yes
 
-- name: enable systemd ressource accounting
-  command: systemctl set-property mariadb CPUAccounting=yes MemoryAccounting=yes
-
 - name: delete anonymous users
   mysql_user: user='' host_all=yes state='absent'
 
diff --git a/roles/matrix/tasks/main.yml b/roles/matrix/tasks/main.yml
index 15d2408f496468a5077db1428da28f4a425aeff9..b351a884786438573256b5c4a5f5fce8753e40ca 100644
--- a/roles/matrix/tasks/main.yml
+++ b/roles/matrix/tasks/main.yml
@@ -150,8 +150,3 @@
     - synapse.service
     - matrix-appservice-irc.service
 
-- name: enable systemd ressource accounting
-  command: systemctl set-property {{item}} CPUAccounting=yes MemoryAccounting=yes
-  with_items:
-    - synapse
-    - matrix-appservice-irc
diff --git a/roles/nginx/tasks/main.yml b/roles/nginx/tasks/main.yml
index c24c71050bd9f6fe4265fc90eff3576b5c48ac1f..d2404689c3cb51dbf4819cd4adb8419110e83c52 100644
--- a/roles/nginx/tasks/main.yml
+++ b/roles/nginx/tasks/main.yml
@@ -66,9 +66,6 @@
 - name: enable nginx
   service: name=nginx enabled=yes
 
-- name: enable systemd ressource accounting
-  command: systemctl set-property nginx CPUAccounting=yes MemoryAccounting=yes
-
 - name: open firewall holes
   firewalld: service={{item}} permanent=true state=enabled
   with_items:
diff --git a/roles/opendkim/tasks/main.yml b/roles/opendkim/tasks/main.yml
index 1b451c900398d88d66d3bff4475093516540d34d..513aff0b679f27c84d19c10a4a4486b7b051c72a 100644
--- a/roles/opendkim/tasks/main.yml
+++ b/roles/opendkim/tasks/main.yml
@@ -32,6 +32,3 @@
 - name: start and enable opendkim
   service: name=opendkim enabled=yes state=started
 
-- name: enable systemd ressource accounting
-  command: systemctl set-property opendkim CPUAccounting=yes MemoryAccounting=yes
-
diff --git a/roles/planet/tasks/main.yml b/roles/planet/tasks/main.yml
index 018982aa105585db22fc24be4568829be48e628c..edfbac02b935f7baa80b1168fc6c7ddeb6c456d5 100644
--- a/roles/planet/tasks/main.yml
+++ b/roles/planet/tasks/main.yml
@@ -40,6 +40,3 @@
   service: name={{ item }} enabled=yes state=started
   with_items:
     - planet.timer
-
-- name: enable systemd ressource accounting
-  command: systemctl set-property planet CPUAccounting=yes MemoryAccounting=yes
diff --git a/roles/postfix/tasks/main.yml b/roles/postfix/tasks/main.yml
index 13a3d1d1be3c723981af0f8e7ef5dc157c380401..4824ea54f334c6efdb29582b34285e2a66cda2be 100644
--- a/roles/postfix/tasks/main.yml
+++ b/roles/postfix/tasks/main.yml
@@ -63,9 +63,6 @@
 - name: start and enable postfix
   service: name=postfix enabled=yes state=started
 
-- name: enable systemd ressource accounting
-  command: systemctl set-property postfix CPUAccounting=yes MemoryAccounting=yes
-
 - name: remove old files
   file: path={{item}} state=absent
   with_items:
diff --git a/roles/postfwd/tasks/main.yml b/roles/postfwd/tasks/main.yml
index 71217cd175bec43b159d12ea2dcb062092a183a6..6633cd2648709d2a8117ed2b8d3e2bd9baeee1b5 100644
--- a/roles/postfwd/tasks/main.yml
+++ b/roles/postfwd/tasks/main.yml
@@ -11,7 +11,3 @@
 - name: start and enable postfwd
   service: name=postfwd enabled=yes state=started
 
-- name: enable systemd ressource accounting
-  command: systemctl set-property postfwd CPUAccounting=yes MemoryAccounting=yes
-
-
diff --git a/roles/postgres/tasks/main.yml b/roles/postgres/tasks/main.yml
index 49aa0f1311465a585b47d1d1705616f86baceee8..33578bc63afbd698ba72bc93c47315a4620680f5 100644
--- a/roles/postgres/tasks/main.yml
+++ b/roles/postgres/tasks/main.yml
@@ -25,9 +25,6 @@
 - name: start and enable postgres
   service: name=postgresql enabled=yes state=started
 
-- name: enable systemd ressource accounting
-  command: systemctl set-property postgresql CPUAccounting=yes MemoryAccounting=yes
-
 - name: set postgres user password
   postgresql_user: name=postgres password={{ vault_postgres_users.postgres }} encrypted=yes
   become: yes
diff --git a/roles/quassel/tasks/main.yml b/roles/quassel/tasks/main.yml
index 7f240e7bf485853517909e5dcf1a8769459da407..713f1f2feb7c1f0b11f6e3113195f51033a2f50c 100644
--- a/roles/quassel/tasks/main.yml
+++ b/roles/quassel/tasks/main.yml
@@ -62,9 +62,6 @@
     - quassel.service
     - clean-quassel.timer
 
-- name: enable systemd ressource accounting
-  command: systemctl set-property quassel CPUAccounting=yes MemoryAccounting=yes
-
 - name: open firewall holes
   firewalld: port=4242/tcp permanent=true state=enabled
   when: configure_firewall
diff --git a/roles/security_tracker/tasks/main.yml b/roles/security_tracker/tasks/main.yml
index 29fb0200ddbc0618adfbba81d8042c95b383258b..d4a0e05e513118577fa2baee201f92a62cea5bef 100644
--- a/roles/security_tracker/tasks/main.yml
+++ b/roles/security_tracker/tasks/main.yml
@@ -69,6 +69,3 @@
 
 - name: start and enable security-tracker timer
   service: name="security-tracker-update.timer" enabled=yes state=started
-
-- name: enable systemd ressource accounting
-  command: systemctl set-property security-tracker-update CPUAccounting=yes MemoryAccounting=yes
diff --git a/roles/sogrep/tasks/main.yml b/roles/sogrep/tasks/main.yml
index f9a40ca73e80b02f33873478472fcbdbc59f9c23..e85d9e5f78bdc10f7394f518c395dbee38d15d2f 100644
--- a/roles/sogrep/tasks/main.yml
+++ b/roles/sogrep/tasks/main.yml
@@ -20,5 +20,3 @@
 - name: start and enable sogrep units
   service: name=createlinks.timer enabled=yes state=started
 
-- name: enable systemd ressource accounting
-  command: systemctl set-property createlinks CPUAccounting=yes MemoryAccounting=yes
diff --git a/roles/spampd/tasks/main.yml b/roles/spampd/tasks/main.yml
index 04a2edde8b31d0fd4f473af2a9da2b91b91d424f..491a9aaa3c38404b2d3afd5dbfc3ffe517a72cc2 100644
--- a/roles/spampd/tasks/main.yml
+++ b/roles/spampd/tasks/main.yml
@@ -49,6 +49,3 @@
 
 - name: start spampd
   service: name=spampd enabled=yes state=started
-
-- name: enable systemd ressource accounting
-  command: systemctl set-property spampd CPUAccounting=yes MemoryAccounting=yes
diff --git a/roles/sshd/tasks/main.yml b/roles/sshd/tasks/main.yml
index b97d6daad6f321f0c863a60f8423db8337468e2f..03322775c48d072403101f9ac4ff4fc363650ccc 100644
--- a/roles/sshd/tasks/main.yml
+++ b/roles/sshd/tasks/main.yml
@@ -17,9 +17,6 @@
 - name: start and enable sshd
   service: name=sshd enabled=yes state=started
 
-- name: enable systemd ressource accounting
-  command: systemctl set-property sshd CPUAccounting=yes MemoryAccounting=yes
-
 - name: open firewall holes
   firewalld: service=ssh permanent=true state=enabled
   when: configure_firewall
diff --git a/roles/syncrepo/tasks/main.yml b/roles/syncrepo/tasks/main.yml
index 02312b4493a8b3b3e26a82367d45bb86dafcf6cd..9e8ae4fd5abb4b22aa5a84888d0fd397d67bc7e5 100644
--- a/roles/syncrepo/tasks/main.yml
+++ b/roles/syncrepo/tasks/main.yml
@@ -27,9 +27,6 @@
     - syncrepo.timer
     - rsyncd.socket
 
-- name: enable systemd ressource accounting
-  command: systemctl set-property system-rsyncd.slice CPUAccounting=yes MemoryAccounting=yes
-
 - name: set local mirror as cachedir
   lineinfile:
     dest: /etc/pacman.conf
diff --git a/roles/unbound/tasks/main.yml b/roles/unbound/tasks/main.yml
index 0f0980c5d43f2827a81023b2433806cd2e1ce025..cc15621110cef3d04b8cec82964081f79b3d594f 100644
--- a/roles/unbound/tasks/main.yml
+++ b/roles/unbound/tasks/main.yml
@@ -13,6 +13,3 @@
 
 - name: Active service
   service: name=unbound state=started enabled=yes
-
-- name: enable systemd ressource accounting
-  command: systemctl set-property unbound CPUAccounting=yes MemoryAccounting=yes
diff --git a/roles/zabbix-agent/tasks/main.yml b/roles/zabbix-agent/tasks/main.yml
index dac1066c5929810b499266e62b842fd9c6988e0d..792b88ce1276734f0d770fb94f6cfcc7f58d94b9 100644
--- a/roles/zabbix-agent/tasks/main.yml
+++ b/roles/zabbix-agent/tasks/main.yml
@@ -59,16 +59,9 @@
   service: name=nginx-zabbix.service enabled=yes state=started
   when: "'nginx' in group_names"
 
-- name: enable systemd ressource accounting
-  command: systemctl set-property nginx-zabbix CPUAccounting=yes MemoryAccounting=yes
-  when: "'nginx' in group_names"
-
 - name: run zabbix agent service
   service: name=zabbix-agent enabled=yes state=started
 
-- name: enable systemd ressource accounting
-  command: systemctl set-property zabbix-agent CPUAccounting=yes MemoryAccounting=yes
-
 - name: open firewall holes
   firewalld: service=zabbix-agent permanent=true state=enabled
   when: configure_firewall
diff --git a/roles/zabbix-server/tasks/main.yml b/roles/zabbix-server/tasks/main.yml
index ffc087e5e023808bf7e8bd0807fe5e1fe4d31428..a5652e3afad34a1a3494ac91c5280ecb6e4bdc53 100644
--- a/roles/zabbix-server/tasks/main.yml
+++ b/roles/zabbix-server/tasks/main.yml
@@ -63,8 +63,3 @@
 - name: start and enable systemd socket
   service: name=php-fpm@zabbix-web.socket state=started enabled=true
 
-- name: enable systemd ressource accounting php-fpm
-  command: systemctl set-property php-fpm@zabbix-web CPUAccounting=yes MemoryAccounting=yes
-
-- name: enable systemd ressource accounting zabbix-server
-  command: systemctl set-property zabbix-server-pgsql CPUAccounting=yes MemoryAccounting=yes