diff --git a/Containerfile.extra b/Containerfile.extra
index 8a3b8edd..ee6d9e97 100644
--- a/Containerfile.extra
+++ b/Containerfile.extra
@@ -41,6 +41,9 @@ RUN --mount=type=cache,dst=/var/cache/dnf \
         /tmp/build-kmod-zenergy.sh && \
         /tmp/build-kmod-evdi.sh \
     ; fi && \
+    if [[ "${FEDORA_MAJOR_VERSION}" -ge 41 ]]; then \
+        /tmp/build-kmod-gpd-fan.sh \
+    ; fi && \
     /tmp/build-kmod-ayaneo-platform.sh && \
     /tmp/build-kmod-ayn-platform.sh && \
     /tmp/build-kmod-bmi260.sh && \
diff --git a/build-kmod-gpd-fan.sh b/build-kmod-gpd-fan.sh
new file mode 100755
index 00000000..906b690b
--- /dev/null
+++ b/build-kmod-gpd-fan.sh
@@ -0,0 +1,18 @@
+#!/bin/sh
+
+set -oeux pipefail
+
+ARCH="$(rpm -E '%_arch')"
+KERNEL="$(rpm -q "${KERNEL_NAME}" --queryformat '%{VERSION}-%{RELEASE}.%{ARCH}')"
+RELEASE="$(rpm -E '%fedora')"
+
+cp /tmp/ublue-os-akmods-addons/rpmbuild/SOURCES/_copr_ublue-os-akmods.repo /etc/yum.repos.d/
+
+### BUILD gpd-fan (succeed or fail-fast with debug output)
+dnf install -y \
+    akmod-gpd-fan-*.fc${RELEASE}.${ARCH}
+akmods --force --kernels "${KERNEL}" --kmod gpd-fan
+modinfo /usr/lib/modules/${KERNEL}/extra/gpd-fan/gpd-fan.ko.xz > /dev/null \
+|| (find /var/cache/akmods/gpd-fan/ -name \*.log -print -exec cat {} \; && exit 1)
+
+rm -f /etc/yum.repos.d/_copr_ublue-os-akmods.repo