diff --git a/Dockerfile b/Dockerfile
index 11f34d02..f6a18599 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -14,13 +14,19 @@ RUN \
     faenza-icon-theme \
     faenza-icon-theme-xfce4-appfinder \
     faenza-icon-theme-xfce4-panel \
-    firefox \
+    chromium \
     mousepad \
+    ristretto \
     thunar \
+    util-linux-misc \
     xfce4 \
     xfce4-pulseaudio-plugin \
     xfce4-terminal && \
   echo "**** cleanup ****" && \
+  rm -f \
+    /etc/xdg/autostart/xfce4-power-manager.desktop \
+    /etc/xdg/autostart/xscreensaver.desktop \
+    /usr/share/xfce4/panel/plugins/power-manager-plugin.desktop && \
   rm -rf \
     /tmp/*
 
diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64
index d3e0133f..4b36401a 100644
--- a/Dockerfile.aarch64
+++ b/Dockerfile.aarch64
@@ -14,13 +14,19 @@ RUN \
     faenza-icon-theme \
     faenza-icon-theme-xfce4-appfinder \
     faenza-icon-theme-xfce4-panel \
-    firefox \
+    chromium \
     mousepad \
+    ristretto \
     thunar \
+    util-linux-misc \
     xfce4 \
     xfce4-pulseaudio-plugin \
     xfce4-terminal && \
   echo "**** cleanup ****" && \
+  rm -f \
+    /etc/xdg/autostart/xfce4-power-manager.desktop \
+    /etc/xdg/autostart/xscreensaver.desktop \
+    /usr/share/xfce4/panel/plugins/power-manager-plugin.desktop && \
   rm -rf \
     /tmp/*