diff --git a/Dockerfile b/Dockerfile
index ccd00deaa..678e858fc 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM ubuntu:22.04 AS builder
+FROM ubuntu:24.04 AS builder
 
 ENV PYTHON_VERSION=3.12.2
 ENV UV_VERSION=0.5.5
@@ -11,7 +11,8 @@ ENV UV_PROJECT_ENVIRONMENT="/home/apl/.venv"
 RUN mkdir -p /app
 
 # add apl user/group
-RUN groupadd -g 1000 apl \
+RUN userdel -r ubuntu \
+ && groupadd -g 1000 apl \
  && useradd -g apl -s /bin/bash -u 1000 -p apl apl \
  && echo 'apl ALL=(ALL) NOPASSWD:ALL' >> /etc/sudoers \
  && chown -R apl:apl /app \
@@ -60,13 +61,14 @@ RUN cd /app/ibet-Wallet-API \
  && rm -f /app/ibet-Wallet-API/uv.lock \
  && rm -rf /app/ibet-Wallet-API/tests/
 
-FROM ubuntu:22.04 AS runner
+FROM ubuntu:24.04 AS runner
 
 # make application directory
 RUN mkdir -p /app
 
 # add apl user/group
-RUN groupadd -g 1000 apl \
+RUN userdel -r ubuntu \
+ && groupadd -g 1000 apl \
  && useradd -g apl -s /bin/bash -u 1000 -p apl apl \
  && echo 'apl ALL=(ALL) NOPASSWD:ALL' >> /etc/sudoers \
  && chown -R apl:apl /app \
diff --git a/tests/Dockerfile_unittest b/tests/Dockerfile_unittest
index 10ed9e98c..ee118007a 100644
--- a/tests/Dockerfile_unittest
+++ b/tests/Dockerfile_unittest
@@ -1,4 +1,4 @@
-FROM ubuntu:22.04 AS builder
+FROM ubuntu:24.04 AS builder
 
 ENV PYTHON_VERSION=3.12.2
 ENV UV_VERSION=0.5.5
@@ -11,7 +11,8 @@ ENV UV_PROJECT_ENVIRONMENT="/home/apl/.venv"
 RUN mkdir -p /app
 
 # add apl user/group
-RUN groupadd -g 1000 apl \
+RUN userdel -r ubuntu \
+ && groupadd -g 1000 apl \
  && useradd -g apl -s /bin/bash -u 1000 -p apl apl \
  && echo 'apl ALL=(ALL) NOPASSWD:ALL' >> /etc/sudoers \
  && chown -R apl:apl /app \
@@ -57,13 +58,14 @@ RUN cd /app/ibet-Wallet-API \
  && uv venv $UV_PROJECT_ENVIRONMENT \
  && uv sync --frozen --no-install-project --extra ibet-explorer
 
-FROM ubuntu:22.04 AS runner
+FROM ubuntu:24.04 AS runner
 
 # make application directory
 RUN mkdir -p /app
 
 # add apl user/group
-RUN groupadd -g 1000 apl \
+RUN userdel -r ubuntu \
+ && groupadd -g 1000 apl \
  && useradd -g apl -s /bin/bash -u 1000 -p apl apl \
  && echo 'apl ALL=(ALL) NOPASSWD:ALL' >> /etc/sudoers \
  && chown -R apl:apl /app \