diff --git a/src/docker/_imports/default_nonroot_user.df b/src/docker/_imports/default_nonroot_user.df
new file mode 100644
index 00000000..1513df06
--- /dev/null
+++ b/src/docker/_imports/default_nonroot_user.df
@@ -0,0 +1,8 @@
+FROM main as ext
+
+RUN  addgroup --gid 1000 hugo \
+    && adduser --uid 1000 --gid 1000 --disabled-password --gecos "" hugo \
+    && chown -R hugo /src \
+    && chown -R hugo /target
+
+USER hugo
\ No newline at end of file
diff --git a/src/docker/ubuntu-ext/Dockerfile b/src/docker/ubuntu-ext/Dockerfile
index cd01128e..2d82c8d6 100644
--- a/src/docker/ubuntu-ext/Dockerfile
+++ b/src/docker/ubuntu-ext/Dockerfile
@@ -64,6 +64,6 @@ IMPORT ../_imports/ci.df
 
 IMPORT ../_imports/onbuild.df
 
-
+IMPORT ../_imports/default_nonroot_user.df
 
 FROM main
diff --git a/src/docker/ubuntu/base.df b/src/docker/ubuntu/base.df
index 2d2cca19..4f2a9ede 100644
--- a/src/docker/ubuntu/base.df
+++ b/src/docker/ubuntu/base.df
@@ -15,7 +15,7 @@ RUN apt update \
  && rm -rf /var/lib/apt/lists/* \
  && find /tmp -mindepth 1 -maxdepth 1 | xargs rm -rf \
  && mkdir -p /src /target \
- && chmod a+w /src /target
+ && chmod a+w /src /target 
 
 EXPOSE 1313
 
diff --git a/src/docker/ubuntu/ubuntu.df b/src/docker/ubuntu/ubuntu.df
index 9412a7c3..b379b679 100644
--- a/src/docker/ubuntu/ubuntu.df
+++ b/src/docker/ubuntu/ubuntu.df
@@ -10,6 +10,6 @@ IMPORT ../_imports/ci.df
 
 IMPORT ../_imports/onbuild.df
 
-
+IMPORT ../_imports/default_nonroot_user.df
 
 FROM main
\ No newline at end of file