diff --git a/docker-compose-mode-files/conf/cb-ladybug/grpc_conf.yaml b/docker-compose-mode-files/conf/cb-ladybug/grpc_conf.yaml
new file mode 100644
index 0000000..b153640
--- /dev/null
+++ b/docker-compose-mode-files/conf/cb-ladybug/grpc_conf.yaml
@@ -0,0 +1,19 @@
+version: 1
+grpc:
+  ladybugsrv:
+    addr: :50254
+    #reflection: enable
+    #tls:
+    #  tls_cert: $APP_ROOT/certs/server.crt
+    #  tls_key: $APP_ROOT/certs/server.key
+    interceptors:
+      #auth_jwt:
+      #  jwt_key: your_secret_key
+      prometheus_metrics:
+        listen_port: 9095
+      opentracing:
+        jaeger:
+          endpoint: localhost:6834
+          service_name: ladybug grpc server
+          sample_rate: 1
+          
\ No newline at end of file
diff --git a/docker-compose-mode-files/docker-compose.yaml b/docker-compose-mode-files/docker-compose.yaml
index de30f85..4db2fb8 100644
--- a/docker-compose-mode-files/docker-compose.yaml
+++ b/docker-compose-mode-files/docker-compose.yaml
@@ -75,7 +75,7 @@ services:
 
   # CB-Spider
   cb-spider:
-    image: cloudbaristaorg/cb-spider:0.4.6
+    image: cloudbaristaorg/cb-spider:0.4.7
     container_name: cb-spider
     ports:
       - "0.0.0.0:1024:1024"
diff --git a/helm-chart/charts/cb-dragonfly/templates/deployment.yaml b/helm-chart/charts/cb-dragonfly/templates/deployment.yaml
index cff4a51..79e6b04 100644
--- a/helm-chart/charts/cb-dragonfly/templates/deployment.yaml
+++ b/helm-chart/charts/cb-dragonfly/templates/deployment.yaml
@@ -21,6 +21,18 @@ spec:
       serviceAccountName: {{ include "cb-dragonfly.serviceAccountName" . }}
       securityContext:
         {{- toYaml .Values.podSecurityContext | nindent 8 }}
+      initContainers:
+        - name: wait-for-etcd
+          image: darthcabs/tiny-tools:1
+          args:
+          - /bin/bash
+          - -c
+          - >
+            set -x;
+            while [[ "$(curl -s -o /dev/null -w ''%{http_code}'' http://cloud-barista-etcd:2379/health)" != "200" ]]; do 
+              echo '.'
+              sleep 15;
+            done
       containers:
         - name: {{ .Chart.Name }}
           securityContext:
diff --git a/helm-chart/charts/cb-ladybug/files/conf/grpc_conf.yaml b/helm-chart/charts/cb-ladybug/files/conf/grpc_conf.yaml
new file mode 100644
index 0000000..b153640
--- /dev/null
+++ b/helm-chart/charts/cb-ladybug/files/conf/grpc_conf.yaml
@@ -0,0 +1,19 @@
+version: 1
+grpc:
+  ladybugsrv:
+    addr: :50254
+    #reflection: enable
+    #tls:
+    #  tls_cert: $APP_ROOT/certs/server.crt
+    #  tls_key: $APP_ROOT/certs/server.key
+    interceptors:
+      #auth_jwt:
+      #  jwt_key: your_secret_key
+      prometheus_metrics:
+        listen_port: 9095
+      opentracing:
+        jaeger:
+          endpoint: localhost:6834
+          service_name: ladybug grpc server
+          sample_rate: 1
+          
\ No newline at end of file
diff --git a/helm-chart/charts/cb-ladybug/templates/deployment.yaml b/helm-chart/charts/cb-ladybug/templates/deployment.yaml
index 23dfa8b..6e6530e 100644
--- a/helm-chart/charts/cb-ladybug/templates/deployment.yaml
+++ b/helm-chart/charts/cb-ladybug/templates/deployment.yaml
@@ -21,6 +21,18 @@ spec:
       serviceAccountName: {{ include "cb-ladybug.serviceAccountName" . }}
       securityContext:
         {{- toYaml .Values.podSecurityContext | nindent 8 }}
+      initContainers:
+        - name: wait-for-etcd
+          image: darthcabs/tiny-tools:1
+          args:
+          - /bin/bash
+          - -c
+          - >
+            set -x;
+            while [[ "$(curl -s -o /dev/null -w ''%{http_code}'' http://cloud-barista-etcd:2379/health)" != "200" ]]; do 
+              echo '.'
+              sleep 15;
+            done
       containers:
         - name: {{ .Chart.Name }}
           securityContext:
diff --git a/helm-chart/charts/cb-restapigw/templates/deployment.yaml b/helm-chart/charts/cb-restapigw/templates/deployment.yaml
index 0b06e2a..119a712 100644
--- a/helm-chart/charts/cb-restapigw/templates/deployment.yaml
+++ b/helm-chart/charts/cb-restapigw/templates/deployment.yaml
@@ -21,6 +21,18 @@ spec:
       serviceAccountName: {{ include "cb-restapigw.serviceAccountName" . }}
       securityContext:
         {{- toYaml .Values.podSecurityContext | nindent 8 }}
+      initContainers:
+        - name: wait-for-etcd
+          image: darthcabs/tiny-tools:1
+          args:
+          - /bin/bash
+          - -c
+          - >
+            set -x;
+            while [[ "$(curl -s -o /dev/null -w ''%{http_code}'' http://cloud-barista-etcd:2379/health)" != "200" ]]; do 
+              echo '.'
+              sleep 15;
+            done
       containers:
         - name: {{ .Chart.Name }}
           securityContext:
diff --git a/helm-chart/charts/cb-spider/Chart.yaml b/helm-chart/charts/cb-spider/Chart.yaml
index 3cde328..f6d2556 100644
--- a/helm-chart/charts/cb-spider/Chart.yaml
+++ b/helm-chart/charts/cb-spider/Chart.yaml
@@ -2,5 +2,5 @@ apiVersion: v2
 name: cb-spider
 type: application
 version: 0.4.0
-appVersion: 0.4.6
+appVersion: 0.4.7
 description: CB-Spider Helm chart
diff --git a/helm-chart/charts/cb-spider/templates/deployment.yaml b/helm-chart/charts/cb-spider/templates/deployment.yaml
index 284d445..c15ba6b 100644
--- a/helm-chart/charts/cb-spider/templates/deployment.yaml
+++ b/helm-chart/charts/cb-spider/templates/deployment.yaml
@@ -21,6 +21,18 @@ spec:
       serviceAccountName: {{ include "cb-spider.serviceAccountName" . }}
       securityContext:
         {{- toYaml .Values.podSecurityContext | nindent 8 }}
+      initContainers:
+        - name: wait-for-etcd
+          image: darthcabs/tiny-tools:1
+          args:
+          - /bin/bash
+          - -c
+          - >
+            set -x;
+            while [[ "$(curl -s -o /dev/null -w ''%{http_code}'' http://cloud-barista-etcd:2379/health)" != "200" ]]; do 
+              echo '.'
+              sleep 15;
+            done
       containers:
         - name: {{ .Chart.Name }}
           securityContext:
diff --git a/helm-chart/charts/cb-tumblebug/templates/deployment.yaml b/helm-chart/charts/cb-tumblebug/templates/deployment.yaml
index dfd65d9..0a1ad98 100644
--- a/helm-chart/charts/cb-tumblebug/templates/deployment.yaml
+++ b/helm-chart/charts/cb-tumblebug/templates/deployment.yaml
@@ -21,6 +21,18 @@ spec:
       serviceAccountName: {{ include "cb-tumblebug.serviceAccountName" . }}
       securityContext:
         {{- toYaml .Values.podSecurityContext | nindent 8 }}
+      initContainers:
+        - name: wait-for-etcd
+          image: darthcabs/tiny-tools:1
+          args:
+          - /bin/bash
+          - -c
+          - >
+            set -x;
+            while [[ "$(curl -s -o /dev/null -w ''%{http_code}'' http://cloud-barista-etcd:2379/health)" != "200" ]]; do 
+              echo '.'
+              sleep 15;
+            done
       containers:
         - name: {{ .Chart.Name }}
           securityContext:
diff --git a/helm-chart/values.yaml b/helm-chart/values.yaml
index b40ef85..5f9eb1a 100644
--- a/helm-chart/values.yaml
+++ b/helm-chart/values.yaml
@@ -180,4 +180,6 @@ etcd:
     enabled: false
   auth:
     rbac:
-      rootPassword: "cloud-barista!"
+      enabled: false
+      allowNoneAuthentication: true
+      rootPassword: ""