diff --git a/Containerfile.common b/Containerfile.common
index e8e72fac..54851df8 100644
--- a/Containerfile.common
+++ b/Containerfile.common
@@ -54,10 +54,8 @@ RUN if grep -qv "surface" <<< "${KERNEL_FLAVOR}"; then \
     /tmp/build-kmod-VirtualBox.sh && \
     /tmp/build-kmod-wl.sh && \
     /tmp/build-kmod-xpadneo.sh && \
-    /tmp/build-kmod-xpad-noone.sh && \
     /tmp/build-kmod-xone.sh && \
-    /tmp/build-kmod-zenergy.sh && \
-    /tmp/build-kmod-zenpower3.sh
+    /tmp/build-kmod-zenergy.sh
 
 RUN cp /tmp/ublue-os-akmods-addons/rpmbuild/RPMS/noarch/ublue-os-akmods-addons*.rpm \
       /var/cache/rpms/ublue-os/
diff --git a/README.md b/README.md
index 4afb2999..c04dad9f 100644
--- a/README.md
+++ b/README.md
@@ -29,10 +29,8 @@ Feel free to PR more kmod build scripts into this repo!
 - [winesync](https://repo.or.cz/linux/zf.git/shortlog/refs/heads/winesync4) - Support for Winesync/Fastsync/NTSync primitives (akmod from [ublue-os/akmods copr](https://copr.fedorainfracloud.org/coprs/ublue-os/akmods/))
 - [wl (broadcom)](https://github.com/rpmfusion/broadcom-wl/) - support for some legacy broadcom wifi devices
 - [xpadneo](https://github.com/atar-axis/xpadneo) - xbox one controller bluetooth driver (akmod from [negativo17 steam repo](https://negativo17.org/steam/)
-- [xpad-noone](https://github.com/ublue-os/xpad-noone) - xbox/xbox 360 controller driver (akmod from [ublue-os/akmods copr](https://copr.fedorainfracloud.org/coprs/ublue-os/akmods/))
-- [xone](https://github.com/medusalix/xone) - xbox one controller USB wired/RF driver (akmod from [negativo17 steam repo](https://negativo17.org/steam/)
+- [xonedo](https://github.com/BoukeHaarsma23/xonedo/) - xbox one controller USB wired/RF driver modified to work along-side xpad (akmod from [ublue-os/akmods copr](https://copr.fedorainfracloud.org/coprs/ublue-os/akmods/))
 - [zenergy](https://github.com/BoukeHaarsma23/zenergy) - Based on AMD_ENERGY driver, but with some jiffies added so non-root users can read it safely. (akmod from [ublue-os/akmods copr](https://copr.fedorainfracloud.org/coprs/ublue-os/akmods/))
-- [zenpower3](https://git.exozy.me/a/zenpower3) - Zenpower3 is a Linux kernel driver for reading temperature, voltage(SVI2), current(SVI2) and power(SVI2) for AMD Zen family CPUs (akmod from [ublue-os/akmods copr](https://copr.fedorainfracloud.org/coprs/ublue-os/akmods/))
 
 # How it's organized
 
diff --git a/build-kmod-xone.sh b/build-kmod-xone.sh
index 7116060b..68855aaa 100755
--- a/build-kmod-xone.sh
+++ b/build-kmod-xone.sh
@@ -2,8 +2,7 @@
 
 set -oeux pipefail
 
-
-cp /tmp/ublue-os-akmods-addons/rpmbuild/SOURCES/negativo17-fedora-multimedia.repo /etc/yum.repos.d/
+cp /tmp/ublue-os-akmods-addons/rpmbuild/SOURCES/_copr_ublue-os-akmods.repo /etc/yum.repos.d/
 
 ARCH="$(rpm -E '%_arch')"
 KERNEL="$(rpm -q "${KERNEL_NAME}" --queryformat '%{VERSION}-%{RELEASE}.%{ARCH}')"
@@ -14,7 +13,7 @@ RELEASE="$(rpm -E '%fedora')"
 rpm-ostree install \
     akmod-xone-*.fc${RELEASE}.${ARCH}
 akmods --force --kernels "${KERNEL}" --kmod xone
-modinfo /usr/lib/modules/${KERNEL}/extra/xone/xone-{dongle,gip-chatpad,gip-gamepad,gip-guitar,gip-headset,gip,wired}.ko.xz > /dev/null \
+modinfo /usr/lib/modules/${KERNEL}/extra/xone/xone-{dongle,gip-chatpad,gip-gamepad,gip-guitar,gip-headset,gip}.ko.xz > /dev/null \
 || (find /var/cache/akmods/xone/ -name \*.log -print -exec cat {} \; && exit 1)
 
-rm -f /etc/yum.repos.d/negativo17-fedora-multimedia.repo
+rm -f /etc/yum.repos.d/_copr_ublue-os-akmods.repo
diff --git a/build-kmod-xpad-noone.sh b/build-kmod-xpad-noone.sh
deleted file mode 100755
index 3f44ef03..00000000
--- a/build-kmod-xpad-noone.sh
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/bin/sh
-
-set -oeux pipefail
-
-cp /tmp/ublue-os-akmods-addons/rpmbuild/SOURCES/_copr_ublue-os-akmods.repo /etc/yum.repos.d/
-
-ARCH="$(rpm -E '%_arch')"
-KERNEL="$(rpm -q "${KERNEL_NAME}" --queryformat '%{VERSION}-%{RELEASE}.%{ARCH}')"
-RELEASE="$(rpm -E '%fedora')"
-
-
-### BUILD xpad-noone (succeed or fail-fast with debug output)
-rpm-ostree install \
-    akmod-xpad-noone-*.fc${RELEASE}.${ARCH}
-akmods --force --kernels "${KERNEL}" --kmod xpad-noone
-modinfo /usr/lib/modules/${KERNEL}/extra/xpad-noone/xpad-noone.ko.xz > /dev/null \
-|| (find /var/cache/akmods/xpad-noone/ -name \*.log -print -exec cat {} \; && exit 1)
-
-rm -f /etc/yum.repos.d/_copr_ublue-os-akmods.repo
diff --git a/build-kmod-zenpower3.sh b/build-kmod-zenpower3.sh
deleted file mode 100755
index 123ba72e..00000000
--- a/build-kmod-zenpower3.sh
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/bin/sh
-
-set -oeux pipefail
-
-cp /tmp/ublue-os-akmods-addons/rpmbuild/SOURCES/_copr_ublue-os-akmods.repo /etc/yum.repos.d/
-
-ARCH="$(rpm -E '%_arch')"
-KERNEL="$(rpm -q "${KERNEL_NAME}" --queryformat '%{VERSION}-%{RELEASE}.%{ARCH}')"
-RELEASE="$(rpm -E '%fedora')"
-
-
-### BUILD zenpower (succeed or fail-fast with debug output)
-rpm-ostree install \
-    akmod-zenpower3-*.fc${RELEASE}.${ARCH}
-akmods --force --kernels "${KERNEL}" --kmod zenpower3
-modinfo /usr/lib/modules/${KERNEL}/extra/zenpower3/zenpower.ko.xz > /dev/null \
-|| (find /var/cache/akmods/zenpower3/ -name \*.log -print -exec cat {} \; && exit 1)
-
-rm -f /etc/yum.repos.d/_copr_ublue-os-akmods.repo