diff --git a/ci/overrides.py b/ci/overrides.py
index 59d0f19b9b..5b8612a093 100755
--- a/ci/overrides.py
+++ b/ci/overrides.py
@@ -26,7 +26,6 @@
     'rust-afterburn',
     'rust-bootupd',
     'rust-coreos-installer',
-    'rust-fedora-coreos-pinger',
     'rust-ignition-config',
     'rust-zincati',
 ]
diff --git a/manifests/disable-zincati-and-pinger.yaml b/manifests/disable-zincati-and-pinger.yaml
deleted file mode 100644
index c756f3ff6b..0000000000
--- a/manifests/disable-zincati-and-pinger.yaml
+++ /dev/null
@@ -1,2 +0,0 @@
-ostree-layers:
-  - overlay/16disable-zincati-and-pinger
diff --git a/manifests/disable-zincati.yaml b/manifests/disable-zincati.yaml
new file mode 100644
index 0000000000..e7c58fdf2a
--- /dev/null
+++ b/manifests/disable-zincati.yaml
@@ -0,0 +1,2 @@
+ostree-layers:
+  - overlay/16disable-zincati
diff --git a/manifests/fedora-coreos.yaml b/manifests/fedora-coreos.yaml
index a7bef6b85d..a015f413e7 100644
--- a/manifests/fedora-coreos.yaml
+++ b/manifests/fedora-coreos.yaml
@@ -16,7 +16,7 @@ include: fedora-coreos-base.yaml
 conditional-include:
   - if: prod == false
     # long-term, would be good to support specifying a nested TreeComposeConfig
-    include: disable-zincati-and-pinger.yaml
+    include: disable-zincati.yaml
   - if: basearch == "aarch64"
     # Fixup for kdump on aarch64 AWS instances
     include: kdump-aarch64-aws-workaround.yaml
@@ -47,8 +47,6 @@ packages:
   - moby-engine
   # Already pulled in by moby-engine, but let's be explicit. Typhoon uses it.
   - containerd
-  # User metrics
-  - fedora-coreos-pinger
   # Updates
   - zincati
   # Include and set the default editor
@@ -64,15 +62,14 @@ etc-group-members:
 # ⚠⚠⚠ ONLY TEMPORARY HACKS ALLOWED HERE; ALL ENTRIES NEED TRACKER LINKS ⚠⚠⚠
 # See also the version of this in fedora-coreos-base.yaml
 postprocess:
-  # Disable Zincati and fedora-coreos-pinger on non-release builds
+  # Disable Zincati on non-release builds
   # https://github.com/coreos/fedora-coreos-tracker/issues/212
   - |
     #!/usr/bin/env bash
     set -xeuo pipefail
     source /etc/os-release
     if [[ $OSTREE_VERSION = *.dev* ]]; then
-      mkdir -p /etc/fedora-coreos-pinger/config.d /etc/zincati/config.d
-      echo -e '# https://github.com/coreos/fedora-coreos-tracker/issues/212\nreporting.enabled = false' > /etc/fedora-coreos-pinger/config.d/95-disable-on-dev.toml
+      mkdir -p /etc/zincati/config.d
       echo -e '# https://github.com/coreos/fedora-coreos-tracker/issues/212\nupdates.enabled = false' > /etc/zincati/config.d/95-disable-on-dev.toml
     fi
   # Users shouldn't be configuring `rpm-ostreed.conf`
diff --git a/overlay.d/15fcos/usr/lib/systemd/system-preset/45-fcos.preset b/overlay.d/15fcos/usr/lib/systemd/system-preset/45-fcos.preset
index c1d3e4dc9a..fd18bec843 100644
--- a/overlay.d/15fcos/usr/lib/systemd/system-preset/45-fcos.preset
+++ b/overlay.d/15fcos/usr/lib/systemd/system-preset/45-fcos.preset
@@ -1,5 +1,3 @@
-# User metrics client
-enable fedora-coreos-pinger.service
 enable coreos-check-ssh-keys.service
 # Check if cgroupsv1 is still being used
 enable coreos-check-cgroups.service
diff --git a/overlay.d/16disable-zincati-and-pinger/etc/fedora-coreos-pinger/config.d/90-disable-on-non-production-stream.toml b/overlay.d/16disable-zincati-and-pinger/etc/fedora-coreos-pinger/config.d/90-disable-on-non-production-stream.toml
deleted file mode 100644
index 20e6b5a5c2..0000000000
--- a/overlay.d/16disable-zincati-and-pinger/etc/fedora-coreos-pinger/config.d/90-disable-on-non-production-stream.toml
+++ /dev/null
@@ -1,2 +0,0 @@
-# https://github.com/coreos/fedora-coreos-tracker/issues/163
-reporting.enabled = false
diff --git a/overlay.d/16disable-zincati-and-pinger/etc/zincati/config.d/90-disable-on-non-production-stream.toml b/overlay.d/16disable-zincati/etc/zincati/config.d/90-disable-on-non-production-stream.toml
similarity index 100%
rename from overlay.d/16disable-zincati-and-pinger/etc/zincati/config.d/90-disable-on-non-production-stream.toml
rename to overlay.d/16disable-zincati/etc/zincati/config.d/90-disable-on-non-production-stream.toml
diff --git a/overlay.d/README.md b/overlay.d/README.md
index 85bb10df38..65f08c236a 100644
--- a/overlay.d/README.md
+++ b/overlay.d/README.md
@@ -35,14 +35,14 @@ Things that are more closely "Fedora CoreOS":
 * disable password logins by default over SSH
 * enable SSH keys written by Ignition and Afterburn
 * branding (MOTD)
-* enable services by default (fedora-coreos-pinger)
+* enable FCOS-specific services by default
 * display warnings on the console if no ignition config was provided or no ssh
   key found.
 
-16disable-zincati-and-pinger
-------------------------
+16disable-zincati
+-----------------
 
-Disable Zincati and fedora-coreos-pinger on non-production streams:
+Disable Zincati on non-production streams:
 https://github.com/coreos/fedora-coreos-tracker/issues/163
 
 20platform-chrony