diff --git a/config/default-beaker.hjson b/config/default-beaker.hjson
index 366a91defb58fd404913a8e1de6ded29fb2c8070..d0c8bee2e749dcb65347c9593524a3e15eede432 100644
--- a/config/default-beaker.hjson
+++ b/config/default-beaker.hjson
@@ -2,7 +2,6 @@ k8component: {
   image: {
     imageType: beaker
     imageSubtype: default1
-    keysToProtect: ["imageType","containerPerSession"]
     image: "labdev-nomad.esc.rzg.mpg.de:5000/nomadlab/notebook:v1.11.5-7-g851b73b-dirty",
     port: 8801,
     prefix: "/beaker",
diff --git a/config/default-creedo.hjson b/config/default-creedo.hjson
index ecf25db00ed72d57941c73c4375e0fdec4065208..4c7c71dd39d37e27162bf15da4b3644bb7da8baf 100644
--- a/config/default-creedo.hjson
+++ b/config/default-creedo.hjson
@@ -2,7 +2,6 @@ k8component: {
   image: {
     imageType: creedo
     imageSubtype: default1
-    keysToProtect: ["containerPerSession"]
     image: "labdev-nomad.esc.rzg.mpg.de:5000/nomadlab/creedo:v0.4.2-2017-09-29",
     port: 8080,
     prefix: "/Creedo",
diff --git a/config/default-jupyter.hjson b/config/default-jupyter.hjson
index bf46bd8a3b9fd646865368bc96b4c07d0f751808..8228e3604f07d8341320bd9ba2448656a5dd95b8 100644
--- a/config/default-jupyter.hjson
+++ b/config/default-jupyter.hjson
@@ -2,7 +2,6 @@ k8component: {
   image: {
     name: jupyter
     subtype: default1
-    keysToProtect: ["containerPerSession"]
     image: "labdev-nomad.esc.rzg.mpg.de:5000/nomadlab/notebook-jupyter-libatoms-tutorial:v0.4",
     port: 8888,
     prefix: "/jupyter",
diff --git a/config/default-remotevis.hjson b/config/default-remotevis.hjson
index c06e783cc089ea26cf5d530d67139789189d6a33..56740f429224ea4bfc197d53af0d234430b546c5 100644
--- a/config/default-remotevis.hjson
+++ b/config/default-remotevis.hjson
@@ -2,7 +2,6 @@ k8component: {
   image: {
     name: remotevis
     subtype: default1
-    keysToProtect: ["containerPerSession"]
     image: "labdev-nomad.esc.rzg.mpg.de:5000/nomadlab/notebook-jupyter-libatoms-tutorial",
     port: 8809,
     prefix: "/jupyter",
diff --git a/config/default.hjson b/config/default.hjson
index 997b8fd17e5577001643b64a5df1728d159d44f2..3aede1507858e07233518089bdcef6fc35dc01cf 100644
--- a/config/default.hjson
+++ b/config/default.hjson
@@ -49,12 +49,12 @@ k8component: {
   templatePath: "defaultTemplate.yaml"
   keysToProtect: ["keysToProtect", "keysToSkip"]
   keysToSkip: ["templateCacheTtlMaxMs", "templateCacheNMax", "keysToSkip", "keysToProtect", "images", "entryPoint", "commands"]
-  containerPerSession: false
   image: {
     imageType: beaker
     imageSubtype: default
-    keysToProtect: ["imageType", "containerPerSession"]
-    image: "labdev-nomad.esc.rzg.mpg.de:5000/nomadlab/notebook:v1.8.0-214-gdd60aa28-dirty"
+    keysToProtect: ["imageType", "imageReStr"]
+    imageReStr: "^(labdev-nomad\\.esc\\.rzg\\.mpg.de|analytics-toolkit\\.nomad-coe\\.eu)(:[0-9]+)?/([-a-z0-9]*)/([-a-z0-9]*(:[a-z.-])$".
+    image: ""
     port: 8801
     prefix: "/beaker"
     homePath: "/home/beaker"
diff --git a/kubeSupport/setup.sh b/kubeSupport/setup.sh
index bbc46e7d9246dc0284b3472caea01783d824c29d..bf09c568d2b36620598d69725863479be1b5ef18 100644
--- a/kubeSupport/setup.sh
+++ b/kubeSupport/setup.sh
@@ -1,8 +1,16 @@
 target_hostname=${target_hostname:-$HOSTNAME}
 cat <<EOF
+# once (create secrets)
+if [ ! -e redis-session-db-pwd.txt ]; then
+  cat /dev/urandom | tr -dc 'a-zA-Z0-9' | fold -w 32 | head -n 1 > redis-session-db-pwd.txt
+fi
 kubectl create secret generic redis-session-db-pwd --from-file=./redis-session-db-pwd.txt
-helm install --name redis-session-db -f redis-session-db-values.yaml stable/redis
+if [ ! -e redis-user-db-pwd.txt ]; then
+  cat /dev/urandom | tr -dc 'a-zA-Z0-9' | fold -w 32 | head -n 1 > redis-user-db-pwd.txt
+fi
 kubectl create secret generic redis-user-db-pwd --from-file=./redis-user-db-pwd.txt
+
+helm install --name redis-session-db -f redis-session-db-values.yaml stable/redis
 kubectl apply -f redis-user-db-volume-$target_hostname.yaml
 helm install --name redis-user-db -f redis-user-db-values.yaml stable/redis
 EOF