diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
index d13653a3..a0e413e0 100644
--- a/.devcontainer/devcontainer.json
+++ b/.devcontainer/devcontainer.json
@@ -25,7 +25,7 @@
 		}
 	},
 	// From this line below are for qemu, so not that important.
-	"initializeCommand": "xhost +local:docker", // "xhost -local:docker" to disable
+	"initializeCommand": "[ -x \"$(command -v xhost)\" ] && xhost +local:docker || true", // "xhost -local:docker" to disable
 	"mounts": [
 		{
 			"source": "/tmp/.X11-unix",
diff --git a/.github/workflows/makefile.yml b/.github/workflows/makefile.yml
index 1e58e813..10eca3d9 100644
--- a/.github/workflows/makefile.yml
+++ b/.github/workflows/makefile.yml
@@ -27,7 +27,6 @@ jobs:
         sudo mkdir -p /tmp/.X11-unix
         sudo mkdir -p /run/user/1000/pulse
         sudo touch /run/user/1000/pulse/native
-        sudo apt install x11-xserver-utils
 
     - name: Run make ci-setup in dev container
       if: steps.cache-cross.outputs.cache-hit != 'true'
@@ -134,7 +133,6 @@ jobs:
         sudo mkdir -p /tmp/.X11-unix
         sudo mkdir -p /run/user/1000/pulse
         sudo touch /run/user/1000/pulse/native
-        sudo apt install x11-xserver-utils
 
     - name: Build AMD64 Debug
       if: always()