diff --git a/Dockerfile b/Dockerfile
index 4f15c9635..82691c59c 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -72,9 +72,6 @@ FROM base
 ARG variant
 RUN <<EORUN
 set -xeuo pipefail
-# Ensure we've flushed out prior state (i.e. files no longer shipped from the old version);
-# and yes, we may need to go to building an RPM in this Dockerfile by default.
-rm -vf /usr/lib/systemd/system/multi-user.target.wants/bootc-*
 case "${variant}" in
   *-sdboot)
     dnf -y install systemd-boot-unsigned
@@ -123,6 +120,10 @@ type = "${fs}"
 EOF
   fi
 fi
+
+# Ensure we've flushed out prior state (i.e. files no longer shipped from the old version);
+# and yes, we may need to go to building an RPM in this Dockerfile by default.
+(set +x; rpm -ql bootc | while read line; do if test -f $line; then rm -v $line; fi; done)
 EORUN
 # Create a layer that is our new binaries
 COPY --from=build /out/ /
diff --git a/Makefile b/Makefile
index e8cc0169f..92bda3260 100644
--- a/Makefile
+++ b/Makefile
@@ -65,6 +65,12 @@ install:
 	# Copy dracut and systemd config files
 	cp -Prf baseimage/dracut $(DESTDIR)$(prefix)/share/doc/bootc/baseimage/dracut
 	cp -Prf baseimage/systemd $(DESTDIR)$(prefix)/share/doc/bootc/baseimage/systemd
+	# Install fedora-bootc-destructive-cleanup in fedora derivatives
+	ID=$$(. /usr/lib/os-release && echo $$ID); \
+	ID_LIKE=$$(. /usr/lib/os-release && echo $$ID_LIKE); \
+	if [ "$$ID" = "fedora" ] || [[ "$$ID_LIKE" == *"fedora"* ]]; then \
+	install -D -m 0755 -t $(DESTDIR)/$(prefix)/lib/bootc contrib/scripts/fedora-bootc-destructive-cleanup; \
+	fi
 
 # Run this to also take over the functionality of `ostree container` for example.
 # Only needed for OS/distros that have callers invoking `ostree container` and not bootc.