diff --git a/Dockerfile.ubuntu-2404 b/Dockerfile.ubuntu-2404
index 187a559..8e9da47 100644
--- a/Dockerfile.ubuntu-2404
+++ b/Dockerfile.ubuntu-2404
@@ -26,6 +26,9 @@ ENV GID=1001
 
 SHELL ["/bin/bash", "-o", "pipefail", "-c"]
 
+## Remove ubuntu user added in 24.04 by default
+RUN touch /var/mail/ubuntu && chown ubuntu /var/mail/ubuntu && userdel -r ubuntu
+
 ## Install Base LinuxGSM Requirements
 RUN echo "**** Install Base LinuxGSM Requirements ****" \
   && apt-get update \
diff --git a/entrypoint-healthcheck.sh b/entrypoint-healthcheck.sh
old mode 100755
new mode 100644
diff --git a/entrypoint-user.sh b/entrypoint-user.sh
old mode 100755
new mode 100644
diff --git a/entrypoint.sh b/entrypoint.sh
old mode 100755
new mode 100644