diff --git a/.github/workflows/build-test-deploy.yml b/.github/workflows/build-test-deploy.yml
index 0887192..9089247 100644
--- a/.github/workflows/build-test-deploy.yml
+++ b/.github/workflows/build-test-deploy.yml
@@ -26,6 +26,7 @@ jobs:
           centos-7,
           debian-10,
           debian-11,
+	  debian-12,
           fedora-36,
           opensuse-15.4,
           ubuntu-18.04,
@@ -45,7 +46,7 @@ jobs:
       GHCR_PASSWORD: ${{ secrets.GITHUB_TOKEN }}
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       # Build and test the images
       - name: Run build-and-test.sh
diff --git a/dockerfiles/debian/debian-12/debian-12-base/Dockerfile b/dockerfiles/debian/debian-12/debian-12-base/Dockerfile
new file mode 100644
index 0000000..0323665
--- /dev/null
+++ b/dockerfiles/debian/debian-12/debian-12-base/Dockerfile
@@ -0,0 +1,61 @@
+# debian-12-base
+# Copyright (C) 2015-2021 Intel Corporation
+# Copyright (C) 2024 Konsulko Group
+#
+# SPDX-License-Identifier: GPL-2.0-only
+#
+
+FROM debian:12
+
+ARG TARGETPLATFORM
+
+RUN apt-get clean && \
+    apt-get update && \
+    DEBIAN_FRONTEND=noninteractive apt-get install -y \
+        build-essential \
+        chrpath \
+        cpio \
+        diffstat \
+        fluxbox \
+        gawk \
+        git-core \
+        locales \
+	lz4 \
+        procps \
+        python3 \
+	python3-pip \
+        screen \
+        socat \
+        subversion \
+        sudo \
+        sysstat \
+        texinfo \
+        tightvncserver \
+        tmux \
+        unzip \
+        wget \
+        xz-utils \
+	zstd && \
+    case ${TARGETPLATFORM} in \
+        "linux/amd64") \
+            DEBIAN_FRONTEND=noninteractive apt-get install -y \
+                gcc-multilib \
+                g++-multilib \
+            ;; \
+    esac && \
+    cp -af /etc/skel/ /etc/vncskel/ && \
+    echo "export DISPLAY=1" >>/etc/vncskel/.bashrc && \
+    mkdir  /etc/vncskel/.vnc && \
+    echo "" | vncpasswd -f > /etc/vncskel/.vnc/passwd && \
+    chmod 0600 /etc/vncskel/.vnc/passwd && \
+    useradd -U -m yoctouser && \
+    echo 'en_US.UTF-8 UTF-8' >> /etc/locale.gen && locale-gen
+
+COPY build-install-dumb-init.sh  /
+RUN  bash /build-install-dumb-init.sh && \
+     rm /build-install-dumb-init.sh && \
+     apt-get clean
+
+USER yoctouser
+WORKDIR /home/yoctouser
+CMD /bin/bash