diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 3404b46c..fe02e660 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -72,7 +72,7 @@ jobs:
             /work/setup_build.sh
             cd /work/buildroot
             make BR2_EXTERNAL=../tp2bmc tp2bmc_defconfig
-            FORCE_UNSAFE_CONFIGURE=1 make
+            make
 
       - name: stamp images
         run: |
diff --git a/Dockerfile b/Dockerfile
index 248baab2..2ce8a8f2 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM mcr.microsoft.com/devcontainers/base:ubuntu22.04
+FROM mcr.microsoft.com/devcontainers/base:ubuntu24.04
 
 RUN apt-get update && apt-get install -y \
     build-essential \
@@ -24,4 +24,6 @@ RUN apt-get update && apt-get install -y \
     libncurses-dev \
     u-boot-tools \
     mkbootimg \
-    && rm -rf /var/lib/apt/lists/*
+    xxd \
+    && rm -rf /var/lib/apt/ \
+    && rm -rf /var/cache/apt/