diff --git a/.github/docker/include b/.github/docker/include
index b13c31f3..aae0f40f 100644
--- a/.github/docker/include
+++ b/.github/docker/include
@@ -14,15 +14,15 @@ layer_begin() {
 	cat /etc/ci-image-info
 	printf "\n"
 
-	echo apt update
+	echo Running: apt update
 	apt update || exit
 	printf "\n"
 
-	echo apt list --upgradable
+	echo Running: apt list --upgradable
 	apt list --upgradable || exit
 	printf "\n"
 
-	echo apt upgrade -y
+	echo Running: apt upgrade -y
 	apt upgrade -y || exit
 	printf "\n"
 
@@ -32,11 +32,19 @@ layer_begin() {
 layer_end() {
 	printf "=== %s:%s start ===\n\n" "${0}" "layer_end()"
 
-	echo apt-get clean
-	apt-get clean || exit
+	echo Running: apt autoremove -y
+	apt autoremove -y || exit
 	printf "\n"
 
-	echo rm -rf /var/lib/apt/lists/*
+	echo Running: apt autoclean -y
+	apt autoclean -y || exit
+	printf "\n"
+
+	echo Running: apt-get clean -y
+	apt-get clean -y || exit
+	printf "\n"
+
+	echo Running: rm -rf /var/lib/apt/lists/*
 	rm -rf /var/lib/apt/lists/* || exit
 	printf "\n"
 
diff --git a/.github/docker/layer-00.00-base-dependencies.sh b/.github/docker/layer-00.00-base-dependencies.sh
index f11e3152..9376bb54 100755
--- a/.github/docker/layer-00.00-base-dependencies.sh
+++ b/.github/docker/layer-00.00-base-dependencies.sh
@@ -17,6 +17,19 @@ main() {
 	apt list --installed >/root/apt-pkgs-start.txt
 	printf "\n"
 
+	echo Running: apt remove -y "$(apt list --installed | grep -e xorg -e xserver -e qt | cut -f1 -d/)"
+	# shellcheck disable=SC2046
+	apt remove -y $(apt list --installed | grep -e xorg -e xserver -e qt | cut -f1 -d/) || exit
+	printf "\n"
+
+	echo Running: apt-get purge libx11.* libqt.*
+	apt-get purge libx11.* libqt.* || exit
+	printf "\n"
+
+	echo Running: apt-get remove -y x11-common
+	apt-get remove -y x11-common || exit
+	printf "\n"
+
 	echo apt install -y "${PACKAGES}"
 	# shellcheck disable=SC2086
 	apt install -y ${PACKAGES} || exit