diff --git a/Dockerfile b/Dockerfile
index 9ac98d92..cce2fc93 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -6,22 +6,42 @@ FROM ghcr.io/linuxserver/baseimage-ubuntu:noble
 ARG BUILD_DATE
 ARG VERSION
 ARG CODE_RELEASE
+ARG DOCKER_HOST_GROUPID=116
 LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DATE}"
 LABEL maintainer="aptalca"
 
+USER root
+
 # environment settings
 ARG DEBIAN_FRONTEND="noninteractive"
 ENV HOME="/config"
-
+RUN useradd -U -u 1000 -ms /bin/bash ubuntu
+RUN groupadd -g ${DOCKER_HOST_GROUPID} docker-host
 RUN \
   echo "**** install runtime dependencies ****" && \
   apt-get update && \
   apt-get install -y \
+    apt-transport-https \
     git \
     libatomic1 \
+    vim \
+    wget \    
+    mc \
     nano \
     net-tools \
     sudo && \
+  curl -fsSL https://download.docker.com/linux/ubuntu/gpg | sudo gpg --dearmor -o /etc/apt/keyrings/docker.gpg && \
+  echo "deb [arch=$(dpkg --print-architecture) signed-by=/etc/apt/keyrings/docker.gpg] https://download.docker.com/linux/ubuntu $(. /etc/os-release && echo "$VERSION_CODENAME") stable" | sudo tee /etc/apt/sources.list.d/docker.list > /dev/null && \
+  apt-get update && \
+  apt-get install -y \
+    docker-ce \
+    docker-ce-cli \
+    containerd.io \
+    docker-buildx-plugin \
+    docker-compose-plugin && \
+  touch /var/run/docker.sock && \
+  chown root:docker-host /var/run/docker.sock && \
+  usermod -aG docker-host ubuntu && \
   echo "**** install code-server ****" && \
   if [ -z ${CODE_RELEASE+x} ]; then \
     CODE_RELEASE=$(curl -sX GET https://api.github.com/repos/coder/code-server/releases/latest \
@@ -42,6 +62,8 @@ RUN \
     /var/lib/apt/lists/* \
     /var/tmp/*
 
+USER ubuntu
+
 # add local files
 COPY /root /