diff --git a/.github/workflows/release_docker_hub.yml b/.github/workflows/release_docker_hub.yml
index e9f157ab6aab9..f4e1775a78593 100644
--- a/.github/workflows/release_docker_hub.yml
+++ b/.github/workflows/release_docker_hub.yml
@@ -7,13 +7,15 @@ on:
 jobs:
   release:
     name: Release to Docker Hub
-    runs-on: ubuntu-24.04
+    runs-on: ubuntu-22.04
     steps:
     - name: Checkout
       uses: actions/checkout@v3
 
     - name: Set up QEMU
-      uses: docker/setup-qemu-action@v2
+      uses: docker/setup-qemu-action@v3
+      with:
+        image: tonistiigi/binfmt:qemu-v7.0.0-28
 
     - name: Set up Docker Buildx
       uses: docker/setup-buildx-action@v2
diff --git a/contrib/containers/deploy/Dockerfile b/contrib/containers/deploy/Dockerfile
index e5c3b7bafb434..06e9b6aacfff7 100644
--- a/contrib/containers/deploy/Dockerfile
+++ b/contrib/containers/deploy/Dockerfile
@@ -1,13 +1,18 @@
-FROM phusion/baseimage:noble-1.0.0
+FROM phusion/baseimage:jammy-1.0.4
 LABEL maintainer="Dash Developers <dev@dash.org>"
 LABEL description="Dockerised DashCore, built from CI"
 
-# Setup unprivileged user
-ARG USER_ID=1000 \
-    GROUP_ID=1000
-RUN groupmod -g ${GROUP_ID} -n dash ubuntu; \
-    usermod -u ${USER_ID} -md /home/dash -l dash ubuntu; \
-    mkdir -p /home/dash/.dashcore && \
+ARG USER_ID
+ARG GROUP_ID
+
+ENV HOME="/home/dash"
+
+# add user with specified (or default) user/group ids
+ENV USER_ID="${USER_ID:-1000}"
+ENV GROUP_ID="${GROUP_ID:-1000}"
+RUN groupadd -g ${GROUP_ID} dash && \
+    useradd -u ${USER_ID} -g dash -s /bin/bash -m -d /home/dash dash && \
+    mkdir /home/dash/.dashcore && \
     chown ${USER_ID}:${GROUP_ID} -R /home/dash
 
 COPY bin/* /usr/local/bin/
diff --git a/contrib/containers/deploy/Dockerfile.GitHubActions.Dispatch b/contrib/containers/deploy/Dockerfile.GitHubActions.Dispatch
index e2439f72c09c2..4db05ed6c25f5 100644
--- a/contrib/containers/deploy/Dockerfile.GitHubActions.Dispatch
+++ b/contrib/containers/deploy/Dockerfile.GitHubActions.Dispatch
@@ -1,6 +1,6 @@
 # syntax=docker/dockerfile:1.3
 
-FROM --platform=$BUILDPLATFORM ubuntu:noble as builder
+FROM --platform=$BUILDPLATFORM ubuntu:jammy as builder
 RUN apt-get update && \
     apt-get -y install --no-install-recommends \
     automake \
@@ -42,7 +42,7 @@ RUN mkdir built-target && \
   "linux/amd64") cp depends/x86_64-pc-linux-gnu/bin/dash* /home/dash/built-target ;; \
 esac
 
-FROM ubuntu:noble
+FROM ubuntu:jammy
 LABEL maintainer="Dash Developers <dev@dash.org>"
 LABEL description="Dockerised DashCore"
 
@@ -52,12 +52,12 @@ ARG TAG
 
 ENV HOME="/home/dash"
 
-# Setup unprivileged user
-ARG USER_ID=1000 \
-    GROUP_ID=1000
-RUN groupmod -g ${GROUP_ID} -n dash ubuntu; \
-    usermod -u ${USER_ID} -md /home/dash -l dash ubuntu; \
-    mkdir -p /home/dash/.dashcore && \
+# add user with specified (or default) user/group ids
+ENV USER_ID="${USER_ID:-1000}"
+ENV GROUP_ID="${GROUP_ID:-1000}"
+RUN groupadd -g ${GROUP_ID} dash && \
+    useradd -u ${USER_ID} -g dash -s /bin/bash -m -d /home/dash dash  && \
+    mkdir /home/dash/.dashcore && \
     chown ${USER_ID}:${GROUP_ID} -R /home/dash
 
 RUN apt-get update && \
diff --git a/contrib/containers/deploy/Dockerfile.GitHubActions.Release b/contrib/containers/deploy/Dockerfile.GitHubActions.Release
index e222faf07bc80..c32bada29c588 100644
--- a/contrib/containers/deploy/Dockerfile.GitHubActions.Release
+++ b/contrib/containers/deploy/Dockerfile.GitHubActions.Release
@@ -1,4 +1,4 @@
-FROM ubuntu:noble
+FROM ubuntu:jammy
 LABEL maintainer="Dash Developers <dev@dash.org>"
 LABEL description="Dockerised DashCore"
 
@@ -9,12 +9,12 @@ ARG GITHUB_REPOSITORY
 
 ENV HOME /home/dash
 
-# Setup unprivileged user
-ARG USER_ID=1000 \
-    GROUP_ID=1000
-RUN groupmod -g ${GROUP_ID} -n dash ubuntu; \
-    usermod -u ${USER_ID} -md /home/dash -l dash ubuntu; \
-    mkdir -p /home/dash/.dashcore && \
+# add user with specified (or default) user/group ids
+ENV USER_ID ${USER_ID:-1000}
+ENV GROUP_ID ${GROUP_ID:-1000}
+RUN groupadd -g ${GROUP_ID} dash && \
+    useradd -u ${USER_ID} -g dash -s /bin/bash -m -d /home/dash dash  && \
+    mkdir /home/dash/.dashcore && \
     chown ${USER_ID}:${GROUP_ID} -R /home/dash
 
 RUN apt-get update && \