diff --git a/salt/common/nginx/nginx.conf.so-master b/salt/common/nginx/nginx.conf.so-master
index 357995431..2fe4e2ea9 100644
--- a/salt/common/nginx/nginx.conf.so-master
+++ b/salt/common/nginx/nginx.conf.so-master
@@ -87,13 +87,16 @@ http {
             try_files $uri $uri.html /index.html;
         }
 
-        location /app/kibana {
-          proxy_http_version 1.1;
-          proxy_set_header Upgrade $http_upgrade;
-          proxy_set_header Connection 'upgrade';
-          proxy_set_header Host $host;
-          proxy_cache_bypass $http_upgrade;
-          proxy_pass http://{{ masterip }}:5601/app/kibana;
+        location /so-kibana {
+          proxy_pass http://{{ masterip }}:5601/;
+          proxy_read_timeout    90;
+          proxy_connect_timeout 90;
+          proxy_set_header      Host $host;
+          proxy_set_header      X-Real-IP $remote_addr;
+          proxy_set_header      X-Forwarded-For $proxy_add_x_forwarded_for;
+          proxy_set_header      Proxy "";
+          rewrite ^/so-kibana/(.*)$ /$1 break;
+
         }
 
         error_page 404 /404.html;
diff --git a/salt/kibana/init.sls b/salt/kibana/init.sls
index 5e7d2889c..4dd132c7f 100644
--- a/salt/kibana/init.sls
+++ b/salt/kibana/init.sls
@@ -72,7 +72,5 @@ so-kibana:
       - /opt/so/log/kibana:/var/log/kibana:rw
       - /opt/so/conf/kibana/custdashboards:/usr/share/kibana/custdashboards:ro
       - /sys/fs/cgroup:/sys/fs/cgroup:ro
-      - /etc/pki/masterssl.crt:/etc/pki/server.crt:ro
-      - /etc/pki/masterssl.key:/etc/pki/server.key:ro
-    - port_bindings:
+      - port_bindings:
       - 0.0.0.0:5601:5601