diff --git a/Makefile b/Makefile
index db56bca..87417df 100644
--- a/Makefile
+++ b/Makefile
@@ -40,11 +40,15 @@ export ${BUILD_VER_ENV}
 
 # 22.04 - jammy
 # 24.04 - noble
+# 26.04 - resolute
 UBUNTU_VERSION ?= jammy
 UBUNTU_VERSION_NUMBER = 22.04
 ifeq (${UBUNTU_VERSION}, noble)
 UBUNTU_VERSION_NUMBER = 24.04
 endif
+ifeq (${UBUNTU_VERSION}, resolute)
+UBUNTU_VERSION_NUMBER = 26.04
+endif
 
 DEBIAN_VERSION := "1.3.0"
 
diff --git a/README.md b/README.md
index 8075b60..fd58914 100644
--- a/README.md
+++ b/README.md
@@ -19,7 +19,7 @@ For comprehensive documentation including installation, configuration, CDI, Swar
 
 ## Requirements
 
-- Ubuntu 22.04 or 24.04, or RHEL/CentOS 9
+- Ubuntu 22.04, 24.04, or 26.04, or RHEL/CentOS 9
 - Docker version 25 or later
 - All `amd-ctk runtime configure` commands should be run as root/sudo
 
diff --git a/docs/container-runtime/release-notes.rst b/docs/container-runtime/release-notes.rst
index 97b3178..c5cbebb 100644
--- a/docs/container-runtime/release-notes.rst
+++ b/docs/container-runtime/release-notes.rst
@@ -14,7 +14,7 @@ Compatibility Matrix
      - Supported OS
    * - 1.3.0
      - 25.0+
-     - Ubuntu 22.04, Ubuntu 24.04
+     - Ubuntu 22.04, Ubuntu 24.04, Ubuntu 26.04
    * - 1.2.0
      - 25.0+ 
      - Ubuntu 22.04, Ubuntu 24.04
diff --git a/docs/container-runtime/requirements.rst b/docs/container-runtime/requirements.rst
index 0391247..c9eff1d 100644
--- a/docs/container-runtime/requirements.rst
+++ b/docs/container-runtime/requirements.rst
@@ -7,6 +7,7 @@ Supported Operating Systems
 ---------------------------
 - Ubuntu 22.04 LTS (Jammy Jellyfish)
 - Ubuntu 24.04 LTS (Noble Numbat)
+- Ubuntu 26.04 LTS (Resolute Raccoon)
 - RHEL 9.5
 
 .. note::
diff --git a/tools/deb/base-image/entrypoint.sh b/tools/deb/base-image/entrypoint.sh
index 21a1889..8d1db07 100644
--- a/tools/deb/base-image/entrypoint.sh
+++ b/tools/deb/base-image/entrypoint.sh
@@ -22,6 +22,12 @@ sysctl -w vm.max_map_count=262144
 if [[ -n "${USER_NAME:-}" && -n "${USER_UID:-}" && -n "${USER_GID:-}" ]]; then
 	echo "Creating user ${USER_NAME} with UID=${USER_UID}, GID=${USER_GID}..."
 
+	existing_user="$(getent passwd "$USER_UID" | cut -d: -f1)" || true
+	if [[ -n "$existing_user" && "$existing_user" != "$USER_NAME" ]]; then
+		echo "Removing existing user $existing_user with UID=$USER_UID..."
+		userdel -r "$existing_user" || userdel "$existing_user"
+	fi
+
 	if ! getent group "$USER_GID" >/dev/null; then
 		groupadd -g "$USER_GID" "$USER_NAME"
 	fi