diff --git a/.github/workflows/build-nethermind-packages.yml b/.github/workflows/build-nethermind-packages.yml
index 4155421f3cc1..b2ed56d0e9bd 100644
--- a/.github/workflows/build-nethermind-packages.yml
+++ b/.github/workflows/build-nethermind-packages.yml
@@ -22,7 +22,7 @@ jobs:
         run: |
           sudo apt-get update && sudo apt-get install xmlstarlet -y --no-install-recommends
           version_prefix=$(xmlstarlet sel -t -v "//Project/PropertyGroup/VersionPrefix" Directory.Build.props)
-          version_suffix=$(xmlstarlet sel -t -v "//Project/PropertyGroup/VersionSuffix" Directory.Build.props)
+          version_suffix=$(xmlstarlet sel -t -v "//Project/PropertyGroup/VersionSuffix" -n Directory.Build.props)
           version=$([[ -n "$version_suffix" ]] && echo "$version_prefix-$version_suffix" || echo "$version_prefix")
           echo "Detected version $version"
           echo "PACKAGE_PREFIX=nethermind-$version-${GITHUB_SHA:0:8}" >> $GITHUB_ENV
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 9bbdda8836f1..7ca760bcc63d 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -32,7 +32,7 @@ jobs:
         run: |
           sudo apt-get update && sudo apt-get install xmlstarlet -y --no-install-recommends
           version_prefix=$(xmlstarlet sel -t -v "//Project/PropertyGroup/VersionPrefix" Directory.Build.props)
-          version_suffix=$(xmlstarlet sel -t -v "//Project/PropertyGroup/VersionSuffix" Directory.Build.props)
+          version_suffix=$(xmlstarlet sel -t -v "//Project/PropertyGroup/VersionSuffix" -n Directory.Build.props)
           version=$([[ -n "$version_suffix" ]] && echo "$version_prefix-$version_suffix" || echo "$version_prefix")
           package_prefix=nethermind-$version-${GITHUB_SHA:0:8}
           echo "Detected version $version"
diff --git a/scripts/build/deb/Dockerfile b/scripts/build/deb/Dockerfile
index dab95613c6e1..0c93559f4151 100644
--- a/scripts/build/deb/Dockerfile
+++ b/scripts/build/deb/Dockerfile
@@ -1,7 +1,7 @@
 # SPDX-FileCopyrightText: 2025 Demerzel Solutions Limited
 # SPDX-License-Identifier: LGPL-3.0-only
 
-FROM ubuntu:noble@sha256:985be7c735afdf6f18aaa122c23f87d989c30bba4e9aa24c8278912aac339a8d
+FROM ubuntu:noble-20251001@sha256:d22e4fb389065efa4a61bb36416768698ef6d955fe8a7e0cdb3cd6de80fa7eec
 
 ARG ARTIFACTS
 ARG SOURCE_DATE_EPOCH
@@ -9,19 +9,20 @@ ARG SOURCE_DATE_EPOCH
 WORKDIR /nethermind
 
 COPY src/Nethermind/Directory.Build.props .
-COPY scripts/build/deb deb
+COPY --chmod=0755 scripts/build/deb deb
 COPY $ARTIFACTS/linux-x64 deb/nethermind/opt/nethermind
 
-RUN apt-get update && apt-get install xmlstarlet -y --no-install-recommends && \
+RUN apt-get update && apt-get install xmlstarlet=1.6.1-4 -y --no-install-recommends && \
   rm -rf /var/lib/apt/lists/*
 
-RUN version=$(xmlstarlet sel -t -v "//Project/PropertyGroup/VersionPrefix" Directory.Build.props) && \
+RUN version_prefix=$(xmlstarlet sel -t -v "//Project/PropertyGroup/VersionPrefix" Directory.Build.props) && \
+  version_suffix=$(xmlstarlet sel -t -v "//Project/PropertyGroup/VersionSuffix" -n Directory.Build.props) && \
+  version=$([[ -n "$version_suffix" ]] && echo "$version_prefix-$version_suffix" || echo "$version_prefix") && \
   sed -i "s/^Version: .*/Version: $version/" deb/nethermind/DEBIAN/control
 
 WORKDIR /nethermind/deb
 
-RUN chmod 0755 nethermind/DEBIAN && \
-  dpkg-deb --build --root-owner-group nethermind
+RUN dpkg-deb --build --root-owner-group nethermind
 
 VOLUME /output