diff --git a/Dockerfile b/Dockerfile
index 83942ae4debf6673bdb0220414062f9c6465e8d2..bf33b23d65953319a17f495305272ace917a4bda 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -7,9 +7,7 @@ ARG BASE_TAG=8.3
 #change this for deployment!!!
 
 FROM ${BASE_REGISTRY}/${BASE_IMAGE}:${BASE_TAG}
-
-ENV HUB_DEFAULT_PWD=HubSecretPasswd
-
+    
 
 RUN yum -y update \
   && yum clean all
@@ -83,4 +81,4 @@ USER codesonar
 WORKDIR /home/codesonar
 
 EXPOSE 7340/tcp
-CMD ["sh", "-c", "/opt/codesonar-exec.sh $HUB_DEFAULT_PWD"]
+CMD ["sh", "-c", "/opt/codesonar-exec.sh"]
diff --git a/scripts/codesonar-exec.sh b/scripts/codesonar-exec.sh
index d87f1dec35e098ba0deaec7eacdc386f87314d96..c47308ca548b6454b2e622e0246e3f1669248e69 100644
--- a/scripts/codesonar-exec.sh
+++ b/scripts/codesonar-exec.sh
@@ -1,12 +1,20 @@
 #!/bin/sh
   
-
-echo "Starting hub in /home/codesonar/hub"
-echo -e "$1\n$1\n" | /opt/codesonar/codesonar/bin/codesonar hub-start /home/codesonar/hub 0.0.0.0:7340
+  
+if test -f "/home/codesonar/hub/hubpwd"; then
+   echo "Starting hub in /home/codesonar/hub with existing pwd"
+   /opt/codesonar/codesonar/bin/codesonar hub-start /home/codesonar/hub 0.0.0.0:7340
+else
+   HUB_DEFAULT_PWD=$(date +%s | base64 | head -c 32)
+   echo "${HUB_DEFAULT_PWD}" > /home/codesonar/hub/hubpwd
+   chmod 600 /home/codesonar/hub/hubpwd
+   echo "Starting hub with new hub password: ${HUB_DEFAULT_PWD}"
+   echo -e "${HUB_DEFAULT_PWD}\n${HUB_DEFAULT_PWD}\n" |  /opt/codesonar/codesonar/bin/codesonar hub-start /home/codesonar/hub 0.0.0.0:7340
+fi
 
 echo "Hub started..."
 while [ 1 ]
 do
 echo "Hub running"
 sleep 60
-done
\ No newline at end of file
+done