diff --git a/units/systemd-coredump@.service.in b/units/systemd-coredump@.service.in
index 18f2d2d605..f6044a4d3f 100644
--- a/units/systemd-coredump@.service.in
+++ b/units/systemd-coredump@.service.in
@@ -34,4 +34,4 @@ RestrictNamespaces=yes
 RestrictAddressFamilies=AF_UNIX
 SystemCallFilter=~@clock @cpu-emulation @debug @keyring @module @mount @obsolete @raw-io @reboot @swap
 SystemCallArchitectures=native
-ReadWritePaths=/var/lib/systemd/coredump
+StateDirectory=systemd/coredump
diff --git a/units/systemd-journal-remote.service.in b/units/systemd-journal-remote.service.in
index 5404bf1c03..62e862a837 100644
--- a/units/systemd-journal-remote.service.in
+++ b/units/systemd-journal-remote.service.in
@@ -28,7 +28,7 @@ RestrictRealtime=yes
 RestrictNamespaces=yes
 RestrictAddressFamilies=AF_UNIX AF_INET AF_INET6
 SystemCallArchitectures=native
-ReadWritePaths=/var/log/journal/remote
+LogsDirectory=journal/remote
 
 [Install]
 Also=systemd-journal-remote.socket
diff --git a/units/systemd-journal-upload.service.in b/units/systemd-journal-upload.service.in
index d00b929211..b0bee3925e 100644
--- a/units/systemd-journal-upload.service.in
+++ b/units/systemd-journal-upload.service.in
@@ -28,7 +28,7 @@ RestrictRealtime=yes
 RestrictNamespaces=yes
 RestrictAddressFamilies=AF_UNIX AF_INET AF_INET6
 SystemCallArchitectures=native
-ReadWritePaths=/var/lib/systemd/journal-upload
+StateDirectory=systemd/journal-upload
 
 # If there are many split up journal files we need a lot of fds to
 # access them all and combine