diff --git a/Containerfile b/Containerfile
index 18c6851626d..dbd9d1d5e07 100644
--- a/Containerfile
+++ b/Containerfile
@@ -30,7 +30,14 @@ RUN if [ ${FEDORA_MAJOR_VERSION} -ge "39" ]; then \
             vte-profile && \
         rpm-ostree install \
             prompt && \
-        rm -f /etc/yum.repos.d/_copr_kylegospo-prompt.repo \
+        rm -f /etc/yum.repos.d/_copr_kylegospo-prompt.repo && \
+        rpm-ostree override remove \
+            power-profiles-daemon \
+            || true && \
+        rpm-ostree override remove \
+            tlp \
+            tlp-rdw \
+            || true \
     ; fi
 
 COPY usr /usr
@@ -81,6 +88,9 @@ RUN wget https://copr.fedorainfracloud.org/coprs/ublue-os/staging/repo/fedora-"$
     printf "\n\n[Install]\nWantedBy=bluefin-cli.target" >> /usr/etc/containers/systemd/users/bluefin-cli.container  && \
     sed -i '/AutoUpdate.*/ s/^#*/#/' /usr/etc/containers/systemd/users/bluefin-cli.container && \
     sed -i 's/ContainerName=bluefin/ContainerName=bluefin-cli/' /usr/etc/containers/systemd/users/bluefin-cli.container && \
+    if [[ "${FEDORA_MAJOR_VERSION}" -ge "39" ]]; then \
+        systemctl enable tuned.service \
+    ; fi && \
     systemctl enable rpm-ostree-countme.service && \
     systemctl enable tailscaled.service && \
     systemctl enable dconf-update.service && \
@@ -139,9 +149,6 @@ RUN wget https://copr.fedorainfracloud.org/coprs/ganto/lxc4/repo/fedora-"${FEDOR
 RUN /tmp/build.sh && \
     /tmp/image-info.sh
 
-## power-profiles-daemon with amd p-state support, remove when this is upstream
-RUN rpm-ostree override replace --experimental --from repo=copr:copr.fedorainfracloud.org:ublue-os:staging power-profiles-daemon
-
 RUN wget https://github.com/docker/compose/releases/latest/download/docker-compose-linux-x86_64 -O /tmp/docker-compose && \
     install -c -m 0755 /tmp/docker-compose /usr/bin
 
diff --git a/packages.json b/packages.json
index 3e2daf737f8..5e3cadf189a 100644
--- a/packages.json
+++ b/packages.json
@@ -134,7 +134,12 @@
 			"bluefin": [
 				"gnome-shell-extension-tailscale-gnome-qs",
 				"input-leap",
-                                "nautilus-open-any-terminal"
+				"nautilus-open-any-terminal",
+				"tuned",
+				"tuned-ppd",
+				"tuned-utils",
+				"tuned-utils-systemtap",
+				"tuned-profiles-atomic"
 			],
 			"bluefin-dx": [],
 			"bluefin-framework": []