diff --git a/wis2-grep-management/Dockerfile b/wis2-grep-management/Dockerfile
index 4d83ba7..3ebb1a9 100644
--- a/wis2-grep-management/Dockerfile
+++ b/wis2-grep-management/Dockerfile
@@ -25,13 +25,13 @@ LABEL maintainer="tomkralidis@gmail.com"
 
 ENV TZ="Etc/UTC" \
     DEBIAN_FRONTEND="noninteractive" \
-    DEBIAN_PACKAGES="bash cron curl git python3-pip python3-setuptools vim"
+    DEBIAN_PACKAGES="bash cron curl git python3-pip python3-setuptools sudo vim"
 
 # copy the app
 COPY ./ /app
 
 # add to crontab
-COPY ./docker/wis2-grep-management.cron /etc/cron.d/wis2-grep-management.cron
+COPY ./docker/wis2-grep-management.cron /var/spool/cron/crontabs/wis2-grep
 
 RUN apt-get update -y && \
     # install dependencies
@@ -45,7 +45,13 @@ RUN apt-get update -y && \
     apt autoremove -y && \
     apt-get -q clean && \
     rm -rf /var/lib/apt/lists/* && \
-    chmod 0644 /etc/cron.d/wis2-grep-management.cron && \
-    crontab /etc/cron.d/wis2-grep-management.cron
+    chmod 0644 /var/spool/cron/crontabs/wis2-grep && \
+    crontab /var/spool/cron/crontabs/wis2-grep && \
+    # add wis2-grep user
+    useradd -ms /bin/bash wis2-grep && \
+    adduser wis2-grep sudo && \
+    echo '%sudo ALL=(ALL) NOPASSWD:ALL' >> /etc/sudoers
+
+USER wis2-grep
 
 ENTRYPOINT [ "/app/docker/entrypoint.sh" ]
diff --git a/wis2-grep-management/docker/entrypoint.sh b/wis2-grep-management/docker/entrypoint.sh
index 6fa3d5d..4492082 100755
--- a/wis2-grep-management/docker/entrypoint.sh
+++ b/wis2-grep-management/docker/entrypoint.sh
@@ -24,10 +24,12 @@
 
 echo "START /entrypoint.sh"
 
-printenv | grep -v "no_proxy" >> /etc/environment
+printenv | grep -v "no_proxy" > /tmp/environment
+sudo sh -c 'cat /tmp/environment >> /etc/environment'
+rm -f /tmp/environment
 
 echo "Starting cron"
-service cron start
+sudo service cron start
 service cron status
 
 echo "Caching WNM schema"
diff --git a/wis2-grep-management/docker/wis2-grep-management.cron b/wis2-grep-management/docker/wis2-grep-management.cron
index 2878605..f892d40 100644
--- a/wis2-grep-management/docker/wis2-grep-management.cron
+++ b/wis2-grep-management/docker/wis2-grep-management.cron
@@ -1 +1 @@
-19 * * * * su -c "wis2-grep clean" > /proc/1/fd/1 2>/proc/1/fd/2
+19 * * * * wis2-grep clean > /proc/1/fd/1 2>/proc/1/fd/2