diff --git a/Containerfile b/Containerfile
index 71986322..4f32d145 100644
--- a/Containerfile
+++ b/Containerfile
@@ -179,13 +179,14 @@ RUN rpm-ostree override remove \
         ublue-os-update-services \
         firefox \
         firefox-langpacks \
-        htop \
-        power-profiles-daemon && \
-    if [[ "${IMAGE_FLAVOR}" =~ "framework" ]]; then \
-        rpm-ostree override remove \
-            tlp \
-            tlp-rdw \
-    ; fi
+        htop && \
+    rpm-ostree override remove \
+        power-profiles-daemon \
+        || true && \
+    rpm-ostree override remove \
+        tlp \
+        tlp-rdw \
+        || true
 
 # Install new packages
 RUN rpm-ostree install \