diff --git a/Base/Dockerfile b/Base/Dockerfile
index f966bba241..50806f384c 100644
--- a/Base/Dockerfile
+++ b/Base/Dockerfile
@@ -58,7 +58,7 @@ RUN  mkdir -p /opt/bin
 #======================================
 # Add Grid check script
 #======================================
-COPY check-grid.sh /opt/bin/
+COPY check-grid.sh entry_point.sh /opt/bin/
 RUN chmod +x /opt/bin/check-grid.sh
 
 #======================================
@@ -83,7 +83,9 @@ RUN  sudo mkdir -p /opt/selenium \
   && sudo mkdir -p /var/run/supervisor/ \
   && sudo mkdir -p /var/log/supervisor/ \
   && sudo chown -R seluser:seluser /var/run/supervisor \
-  && sudo chown -R seluser:seluser /var/log/supervisor
+  && sudo chown -R seluser:seluser /var/log/supervisor \
+  && sudo chgrp -R 0 /var/run/supervisor /var/log/supervisor \
+  && sudo chmod -R g=u /var/run/supervisor /var/log/supervisor
 
 
-CMD ["/usr/bin/supervisord", "--configuration", "/etc/supervisord.conf"]
+CMD ["/opt/bin/entry_point.sh"]
diff --git a/Base/entry_point.sh b/Base/entry_point.sh
new file mode 100755
index 0000000000..405b290d4e
--- /dev/null
+++ b/Base/entry_point.sh
@@ -0,0 +1,3 @@
+#!/usr/bin/env bash
+
+/usr/bin/supervisord --configuration /etc/supervisord.conf