diff --git a/Dockerfile b/Dockerfile
index c5919bb..896e234 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -44,8 +44,10 @@ RUN \
     autoconf \
     automake \
     cmake \
+    console-data \
     git \
     grep \
+    kbd \
     libavcodec-dev \
     libdrm-dev \
     libepoxy-dev \
@@ -77,7 +79,16 @@ RUN \
     tightvncserver \
     wget \
     wayland-protocols \
+    x11-apps \
+    x11-common \
+    x11-utils \
+    x11-xkb-utils \
+    x11-xserver-utils \
+    xauth \
+    xdg-utils \
+    xfonts-base \
     xinit \
+    xkb-data \
     xserver-xorg-dev
 
 RUN \
@@ -248,6 +259,7 @@ RUN \
   apt-get update && \
   DEBIAN_FRONTEND=noninteractive apt-get install --no-install-recommends -y \
     ca-certificates \
+    console-data \
     containerd.io \
     cups \
     cups-client \
@@ -264,6 +276,7 @@ RUN \
     fonts-noto-core \
     fuse-overlayfs \
     intel-media-va-driver \
+    kbd \
     libdatetime-perl \
     libfontenc1 \
     libfreetype6 \
@@ -321,7 +334,6 @@ RUN \
     x11-common \
     x11-utils \
     x11-xkb-utils \
-    x11-xkb-utils \
     x11-xserver-utils \
     xauth \
     xdg-utils \
diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64
index 00b3368..30f9187 100644
--- a/Dockerfile.aarch64
+++ b/Dockerfile.aarch64
@@ -48,8 +48,10 @@ RUN \
     autoconf \
     automake \
     cmake \
+    console-data \
     git \
     grep \
+    kbd \
     libavcodec-dev \
     libdrm-dev \
     libepoxy-dev \
@@ -81,7 +83,16 @@ RUN \
     tightvncserver \
     wget \
     wayland-protocols \
+    x11-apps \
+    x11-common \
+    x11-utils \
+    x11-xkb-utils \
+    x11-xserver-utils \
+    xauth \
+    xdg-utils \
+    xfonts-base \
     xinit \
+    xkb-data \
     xserver-xorg-dev
 
 RUN \
@@ -252,6 +263,7 @@ RUN \
   apt-get update && \
   DEBIAN_FRONTEND=noninteractive apt-get install --no-install-recommends -y \
     ca-certificates \
+    console-data \
     containerd.io \
     cups \
     cups-client \
@@ -267,6 +279,7 @@ RUN \
     fonts-noto-color-emoji \
     fonts-noto-core \
     fuse-overlayfs \
+    kbd \
     libdatetime-perl \
     libfontenc1 \
     libfreetype6 \
@@ -324,7 +337,6 @@ RUN \
     x11-common \
     x11-utils \
     x11-xkb-utils \
-    x11-xkb-utils \
     x11-xserver-utils \
     xauth \
     xdg-utils \