diff --git a/docker-compose.override.yml b/docker-compose.override.yml
index 1a27cb7d..d5189749 100644
--- a/docker-compose.override.yml
+++ b/docker-compose.override.yml
@@ -38,7 +38,7 @@ services:
       - ./insights:/opt/insights:rw
       - ./orchestration:/opt/orchestration:rw
       - ./auth:/opt/auth:rw
-      - ./cloudify_insights:/opt/cloudify_insights:rw
+      # - ./cloudify_insights:/opt/cloudify_insights:rw
   celery-gevent: *backend
   scheduler: *backend
   poller: *backend
@@ -47,7 +47,6 @@ services:
   hubshell: *backend
   api: *backend
   sockjs: *backend
-  insights-handler: *backend
   apply-migrations: *backend
 
   ui:
diff --git a/docker/nginx/static/ui/mist-rbac-behavior b/docker/nginx/static/ui/mist-rbac-behavior
index 2d3f3b71..4b8e7321 160000
--- a/docker/nginx/static/ui/mist-rbac-behavior
+++ b/docker/nginx/static/ui/mist-rbac-behavior
@@ -1 +1 @@
-Subproject commit 2d3f3b71de714766108c776c28d134c20f1e71cb
+Subproject commit 4b8e73213022310e34eec8dcd0ea96b3c496dba3
diff --git a/ui b/ui
index afecd6cf..b73618e8 160000
--- a/ui
+++ b/ui
@@ -1 +1 @@
-Subproject commit afecd6cf561b5bd7df06f983ef87f8e10e010dcd
+Subproject commit b73618e8d66b9fdfd3743d44d6315cf7c4fb19f2