diff --git a/Dockerfile b/Dockerfile
index c2ac72e9..2410e44c 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -12,11 +12,10 @@ RUN \
 	faenza-icon-theme \
 	faenza-icon-theme-xfce4-appfinder \
 	faenza-icon-theme-xfce4-panel \
-	firefox \
+	firefox-esr \
 	font-noto \
 	mousepad \
-	setxkbmap \
-	thunar-volman \
+	thunar \
 	xfce4 \
 	xfce4-terminal && \
  apk add --no-cache --repository=http://dl-cdn.alpinelinux.org/alpine/edge/testing \
diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64
index 5fe17abe..e4a5ee1d 100644
--- a/Dockerfile.aarch64
+++ b/Dockerfile.aarch64
@@ -12,11 +12,10 @@ RUN \
 	faenza-icon-theme \
 	faenza-icon-theme-xfce4-appfinder \
 	faenza-icon-theme-xfce4-panel \
-	firefox \
+	firefox-esr \
 	font-noto \
 	mousepad \
-	setxkbmap \
-	thunar-volman \
+	thunar \
 	xfce4 \
 	xfce4-terminal && \
  apk add --no-cache --repository=http://dl-cdn.alpinelinux.org/alpine/edge/testing \
diff --git a/Dockerfile.armhf b/Dockerfile.armhf
index 0ac99238..6ac9acbc 100644
--- a/Dockerfile.armhf
+++ b/Dockerfile.armhf
@@ -12,11 +12,10 @@ RUN \
 	faenza-icon-theme \
 	faenza-icon-theme-xfce4-appfinder \
 	faenza-icon-theme-xfce4-panel \
+	firefox-esr \
 	font-noto \
-	midori \
 	mousepad \
-	setxkbmap \
-	thunar-volman \
+	thunar \
 	xfce4 \
 	xfce4-terminal && \
  apk add --no-cache --repository=http://dl-cdn.alpinelinux.org/alpine/edge/testing \