diff --git a/manifests/fedora-coreos-base.yaml b/manifests/fedora-coreos-base.yaml
index d48601af17..5c30bd9d10 100644
--- a/manifests/fedora-coreos-base.yaml
+++ b/manifests/fedora-coreos-base.yaml
@@ -21,15 +21,7 @@ ostree-layers:
 # Be minimal
 recommends: false
 
-ignore-removed-users:
-  - root
-ignore-removed-groups:
-  - root
-etc-group-members:
-  - wheel
-  - sudo
-  - systemd-journal
-  - adm
+sysusers: true
 
 check-passwd:
   type: "file"
diff --git a/manifests/fedora-coreos.yaml b/manifests/fedora-coreos.yaml
index 2115a986d1..b2ecf95db7 100644
--- a/manifests/fedora-coreos.yaml
+++ b/manifests/fedora-coreos.yaml
@@ -87,13 +87,6 @@ packages:
   # Include and set the default editor
   - nano nano-default-editor
 
-etc-group-members:
-  # Add the docker group to /etc/group
-  # https://github.com/coreos/fedora-coreos-tracker/issues/2
-  # This will be no longer needed when systemd-sysusers has been implemented:
-  # https://github.com/projectatomic/rpm-ostree/issues/49
-  - docker
-
 # ⚠⚠⚠ ONLY TEMPORARY HACKS ALLOWED HERE; ALL ENTRIES NEED TRACKER LINKS ⚠⚠⚠
 # See also the version of this in fedora-coreos-base.yaml
 postprocess: