diff --git a/conf/api.yaml b/conf/api.yaml
index 7dc8f2a..0c05242 100644
--- a/conf/api.yaml
+++ b/conf/api.yaml
@@ -3,7 +3,7 @@
 
 services:
   mc-infra-connector:
-    version: 0.13.2
+    version: 0.13.17
     baseurl: http://mc-infra-connector:1024/spider
     auth:
       type: basic
@@ -17,7 +17,7 @@ services:
       type: bearer
 
   mc-infra-manager:
-    version: 0.13.2
+    version: 0.13.6
     baseurl: http://mc-infra-manager:1323/tumblebug
     auth:
       type: basic
diff --git a/conf/docker/api.yaml b/conf/docker/api.yaml
index 7dc8f2a..0c05242 100644
--- a/conf/docker/api.yaml
+++ b/conf/docker/api.yaml
@@ -3,7 +3,7 @@
 
 services:
   mc-infra-connector:
-    version: 0.13.2
+    version: 0.13.17
     baseurl: http://mc-infra-connector:1024/spider
     auth:
       type: basic
@@ -17,7 +17,7 @@ services:
       type: bearer
 
   mc-infra-manager:
-    version: 0.13.2
+    version: 0.13.6
     baseurl: http://mc-infra-manager:1323/tumblebug
     auth:
       type: basic
diff --git a/conf/docker/conf/mc-web-console/api/conf/api.yaml b/conf/docker/conf/mc-web-console/api/conf/api.yaml
index bee4e2b..72673a3 100644
--- a/conf/docker/conf/mc-web-console/api/conf/api.yaml
+++ b/conf/docker/conf/mc-web-console/api/conf/api.yaml
@@ -3,7 +3,7 @@
 
 services:
   mc-infra-connector:
-    version: 0.13.2
+    version: 0.13.17
     baseurl: http://mc-infra-connector:1024/spider
     auth:
       type: basic
@@ -17,7 +17,7 @@ services:
       type: bearer
 
   mc-infra-manager:
-    version: 0.13.2
+    version: 0.13.6
     baseurl: http://mc-infra-manager:1323/tumblebug
     auth:
       type: basic
diff --git a/conf/docker/docker-compose.mini.yaml b/conf/docker/docker-compose.mini.yaml
index 7c98f33..b984c4f 100644
--- a/conf/docker/docker-compose.mini.yaml
+++ b/conf/docker/docker-compose.mini.yaml
@@ -14,7 +14,7 @@ services:
   ##### MC-INFRA-CONNECTOR #########################################################################################################################
 
   mc-infra-connector:
-    image: cloudbaristaorg/cb-spider:0.12.18
+    image: cloudbaristaorg/cb-spider:0.13.17
     pull_policy: missing
     container_name: mc-infra-connector
     restart: unless-stopped
@@ -49,7 +49,7 @@ services:
   ##### MC-INFRA-MANAGER #########################################################################################################################
 
   mc-infra-manager:
-    image: cloudbaristaorg/cb-tumblebug:0.12.9
+    image: cloudbaristaorg/cb-tumblebug:0.13.6
     container_name: mc-infra-manager
     restart: unless-stopped
     pull_policy: missing
@@ -81,6 +81,8 @@ services:
     environment:
       # - TB_ROOT_PATH=/app
       - TB_SPIDER_REST_URL=${MC_INFRA_CONNECTOR_REST_URL:-http://mc-infra-connector:1024/spider}
+      - TB_SPIDER_USERNAME=${MC_INFRA_CONNECTOR_API_USERNAME:-default}
+      - TB_SPIDER_PASSWORD=${MC_INFRA_CONNECTOR_API_PASSWORD:-default}
       - TB_ETCD_ENDPOINTS=http://mc-infra-manager-etcd:2379
       - TB_TERRARIUM_REST_URL=http://mc-terrarium:8055/terrarium
       - TB_TERRARIUM_API_USERNAME=${MC_INFRA_MANAGER_TERRARIUM_API_USERNAME:-}
@@ -117,7 +119,7 @@ services:
       <<: *default-health-check
 
   mc-infra-manager-etcd:
-    image: gcr.io/etcd-development/etcd:v3.5.21
+    image: gcr.io/etcd-development/etcd:v3.6.11
     container_name: mc-infra-manager-etcd
     restart: unless-stopped
     networks:
diff --git a/conf/docker/docker-compose.yaml b/conf/docker/docker-compose.yaml
index 21c781a..896ae6d 100644
--- a/conf/docker/docker-compose.yaml
+++ b/conf/docker/docker-compose.yaml
@@ -24,7 +24,7 @@ services:
 ##### MC-INFRA-CONNECTOR #########################################################################################################################
 
   mc-infra-connector:
-    image: cloudbaristaorg/cb-spider:0.13.14
+    image: cloudbaristaorg/cb-spider:0.13.17
     pull_policy: missing
     container_name: mc-infra-connector
     restart: unless-stopped
@@ -87,7 +87,7 @@ services:
 ##### MC-INFRA-MANAGER #########################################################################################################################
 
   mc-infra-manager:
-    image: cloudbaristaorg/cb-tumblebug:0.13.5
+    image: cloudbaristaorg/cb-tumblebug:0.13.6
     container_name: mc-infra-manager
     restart: unless-stopped
     pull_policy: missing