diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index e33155405..fb69b5360 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -11,6 +11,7 @@ on:  # yamllint disable-line rule:truthy
     workflows: ["build"]
     types:
       - completed
+
 jobs:
   test:
     env:
@@ -67,3 +68,14 @@ jobs:
           cd z-wave-stack-binaries/bin && file -E *_x86_REALTIME.elf && cd -
           export ZPC_ARGS="--log.level=d"
           ./scripts/tests/z-wave-stack-binaries-test.sh
+
+      - name: Set custom status
+        uses: actions/github-script@v7
+        with:
+          script: |
+            await github.rest.repos.createCommitStatus({
+            owner: context.repo.owner,
+            repo: context.repo.repo,
+            sha: context.sha,
+            state: 'success',
+            })
diff --git a/Dockerfile b/Dockerfile
index 982a66f38..5a1993851 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,11 +1,25 @@
 # SPDX-License-Identifier: Zlib
 # SPDX-FileCopyrightText: Silicon Laboratories Inc. https://www.silabs.com
 
-FROM debian:bookworm as builder
+FROM ubuntu:22.04 as builder
+
+ENV DEBIAN_FRONTEND noninteractive
+ENV LC_ALL en_US.UTF-8
+ENV LANG ${LC_ALL}
 
 ARG UNIFYSDK_GIT_REPOSITORY https://github.com/SiliconLabs/UnifySDK
 ARG UNIFYSDK_GIT_TAG main
 
+RUN echo "# log: Configuring locales" \
+  && set -x  \
+  && apt-get update -y \
+  && apt-get install -y locales \
+  && echo "${LC_ALL} UTF-8" | tee /etc/locale.gen \
+  && locale-gen ${LC_ALL} \
+  && dpkg-reconfigure locales \
+  && TZ=Etc/UTC apt-get -y install tzdata \
+  && date -u
+  
 ENV project z-wave-protocol-controller
 ENV workdir /usr/local/opt/${project}
 ADD . ${workdir}
@@ -32,7 +46,7 @@ RUN echo "# log: Build" \
   && ./helper.mk distclean \
   && date -u
 
-FROM debian:bookworm
+FROM ubuntu:22.04
 ENV project z-wave-protocol-controller
 ENV workdir /usr/local/opt/${project}
 COPY --from=builder ${workdir}/dist/ ${workdir}/dist/
diff --git a/helper.mk b/helper.mk
index f0bcc4f03..ae7db7f94 100755
--- a/helper.mk
+++ b/helper.mk
@@ -45,8 +45,9 @@ packages+=graphviz
 export cmake_options+=-DDOXYGEN_HAVE_DOT=YES
 
 packages+=python3-breathe python3-myst-parser \
-  python3-sphinx-markdown-tables python3-sphinx-rtd-theme \
-  python3-linkify-it
+  python3-sphinx-markdown-tables python3-sphinx-rtd-theme
+
+#packages+=python3-linkify-it # Disable for ubuntu-22.04 use "pip install linkify-it-py" instead
 
 # TODO: https://bugs.debian.org/1004136#python-sphinxcontrib.plantuml
 # packages+=python3-sphinxcontrib.plantuml