diff --git a/.containers/matter-openwrt-build/Dockerfile b/.containers/matter-openwrt-build/Dockerfile
index 356e852..a32875a 100644
--- a/.containers/matter-openwrt-build/Dockerfile
+++ b/.containers/matter-openwrt-build/Dockerfile
@@ -1,4 +1,4 @@
-ARG OPENWRT_VERSION=22.03.5
+ARG OPENWRT_VERSION=23.05.3
 FROM ghcr.io/openwrt/sdk:x86-generic-${OPENWRT_VERSION}
 LABEL org.opencontainers.image.description="Pre-warmed OpenWrt SDK"
 
@@ -6,8 +6,6 @@ LABEL org.opencontainers.image.description="Pre-warmed OpenWrt SDK"
 ARG SRC_PACKAGES="glib2 openssl ubus"
 ARG CFG_PACKAGES="glib2 libopenssl libubus"
 
-# Add host tools from WORKDIR (/builder) to PATH
-ENV PATH="/builder/staging_dir/host/bin:$PATH"
 RUN set -x && \
     grep -w 'base\|packages' feeds.conf.default > feeds.conf && \
     ./scripts/feeds update -a && \
diff --git a/.github/workflows/build-packages.yaml b/.github/workflows/build-packages.yaml
index f13aee0..3609b17 100644
--- a/.github/workflows/build-packages.yaml
+++ b/.github/workflows/build-packages.yaml
@@ -17,7 +17,7 @@ jobs:
       - name: Build
         uses: addnab/docker-run-action@v3
         with:
-          image: ghcr.io/project-chip/matter-openwrt-build:latest
+          image: ghcr.io/project-chip/matter-openwrt-build:22.03.5
           options: --volume ${{ github.workspace }}:/workspace
           shell: bash
           run: |