diff --git a/docker/elk/kibana/Dockerfile b/docker/elk/kibana/Dockerfile
index 5638a660..deafa137 100644
--- a/docker/elk/kibana/Dockerfile
+++ b/docker/elk/kibana/Dockerfile
@@ -16,6 +16,7 @@ RUN apk -U upgrade && \
     mkdir -p /usr/share/kibana/ && \
     wget https://artifacts.elastic.co/downloads/kibana/kibana-6.2.4-linux-x86_64.tar.gz && \
     tar xvfz kibana-6.2.4-linux-x86_64.tar.gz --strip-components=1 -C /usr/share/kibana/ && \
+    unzip kibana_6.2.x_vis_scaling_fixes.zip && \
 
 # Kibana's bundled node does not work in alpine
     rm /usr/share/kibana/node/bin/node && \
@@ -31,16 +32,19 @@ RUN apk -U upgrade && \
     cp elk.ico /usr/share/kibana/src/ui/public/assets/favicons/favicon-16x16.png && \
     cp elk.ico /usr/share/kibana/src/ui/public/assets/favicons/favicon-32x32.png && \
     cp create_kibana_index.js /usr/share/kibana/src/core_plugins/elasticsearch/lib/ && \
+    cd kibana_6.2.x_vis_scaling_fixes && \
+    cp -R * /usr/share/kibana/ && \
     cd / && \
 
-# Setup plugins
-    cd /usr/share/kibana/plugins && \
-    wget https://github.com/dlumbrer/kbn_radar/releases/download/Kibana-6.X/kbn_radar.tar.gz && \
-    wget https://github.com/dlumbrer/kbn_network/releases/download/6.0.X-1/network_vis.tar.gz && \
-    tar xvfz kbn_radar.tar.gz && \
-    tar xvfz network_vis.tar.gz && \
-    rm *.tar.gz && \
-#    /usr/share/kibana/bin/kibana-plugin install https://github.com/johtani/analyze-api-ui-plugin/releases/download/6.2.4/analyze-api-ui-plugin-6.2.4.zip && \
+# Setup plugins, rebuild bundle
+    #cd /usr/share/kibana/plugins && \
+    #wget https://github.com/dlumbrer/kbn_radar/releases/download/Kibana-6.X/kbn_radar.tar.gz && \
+    #wget https://github.com/dlumbrer/kbn_network/releases/download/6.0.X-1/network_vis.tar.gz && \
+    #tar xvfz kbn_radar.tar.gz && \
+    #tar xvfz network_vis.tar.gz && \
+    #rm *.tar.gz && \
+    rm -rf /usr/share/kibana/optimize/bundles/* && \
+    #/usr/share/kibana/bin/kibana-plugin install https://github.com/johtani/analyze-api-ui-plugin/releases/download/6.2.4/analyze-api-ui-plugin-6.2.4.zip && \
 
 # Setup user, groups and configs
     sed -i 's/#server.basePath: ""/server.basePath: "\/kibana"/' /usr/share/kibana/config/kibana.yml && \
diff --git a/docker/elk/kibana/dist/kibana_6.2.x_vis_scaling_fixes.zip b/docker/elk/kibana/dist/kibana_6.2.x_vis_scaling_fixes.zip
new file mode 100644
index 00000000..9e8c57db
Binary files /dev/null and b/docker/elk/kibana/dist/kibana_6.2.x_vis_scaling_fixes.zip differ