diff --git a/.github/workflows/build-debian-based.yml b/.github/workflows/build-debian-based.yml
index cea29413..adb4ebf4 100644
--- a/.github/workflows/build-debian-based.yml
+++ b/.github/workflows/build-debian-based.yml
@@ -7,6 +7,7 @@ on:
       - 'dev'
     paths:
       - 'ci_build_images/debian.Dockerfile'
+      - 'ci_build_images/hashicorp.Dockerfile'
       - 'ci_build_images/qpress.Dockerfile'
       - 'ci_build_images/buildbot-worker.Dockerfile'
       - .github/workflows/build-debian-based.yml
@@ -14,6 +15,7 @@ on:
   pull_request:
     paths:
       - 'ci_build_images/debian.Dockerfile'
+      - 'ci_build_images/hashicorp.Dockerfile'
       - 'ci_build_images/qpress.Dockerfile'
       - 'ci_build_images/buildbot-worker.Dockerfile'
       - .github/workflows/build-debian-based.yml
@@ -44,6 +46,13 @@ jobs:
             tag: debian12-386
             nogalera: false
 
+          - image: debian:12
+            platforms: linux/386
+            branch: 10.11
+            tag: debian12-386-hashicorp
+            nogalera: false
+            dockerfile: 'debian.Dockerfile hashicorp.Dockerfile'
+
           - image: debian:sid
             platforms: linux/amd64, linux/arm64/v8, linux/ppc64le
             branch: 11.4
@@ -78,7 +87,7 @@ jobs:
 
     uses: ./.github/workflows/bbw_build_container_template.yml
     with:
-      dockerfile: debian.Dockerfile
+      dockerfile: ${{ matrix.dockerfile || 'debian.Dockerfile' }}
       image: ${{ matrix.image }}
       platforms: ${{ matrix.platforms }}
       tag: ${{ matrix.tag }}
diff --git a/ci_build_images/hashicorp.Dockerfile b/ci_build_images/hashicorp.Dockerfile
new file mode 100644
index 00000000..f8a56ae4
--- /dev/null
+++ b/ci_build_images/hashicorp.Dockerfile
@@ -0,0 +1,17 @@
+
+# INSTALL HASHICORP VAULT
+# USAGE: vault server -dev > /dev/null 2>&1 &
+
+RUN curl -fsSL https://apt.releases.hashicorp.com/gpg | gpg --dearmor -o /usr/share/keyrings/hashicorp-archive-keyring.gpg \
+&& echo "deb [arch=$(dpkg --print-architecture) signed-by=/usr/share/keyrings/hashicorp-archive-keyring.gpg] \
+https://apt.releases.hashicorp.com $(lsb_release -cs) main" | tee /etc/apt/sources.list.d/hashicorp.list \
+&& apt-get update \
+&& apt-get -y install --no-install-recommends vault \
+&& setcap cap_ipc_lock=-ep "$(readlink -f "$(which vault)")" \
+&& apt-get clean
+
+# VAULT CONFIGURATION
+ENV VAULT_DEV_ROOT_TOKEN_ID='MTR'
+# MTR CONFIGURATION
+ENV VAULT_TOKEN='MTR'
+ENV VAULT_ADDR='http://127.0.0.1:8200'