diff --git a/roles/opendistro/opendistro-kibana/tasks/main.yml b/roles/opendistro/opendistro-kibana/tasks/main.yml
index 3fa8dd5e..41980054 100755
--- a/roles/opendistro/opendistro-kibana/tasks/main.yml
+++ b/roles/opendistro/opendistro-kibana/tasks/main.yml
@@ -13,7 +13,7 @@
 
 - name: Install Kibana
   package:
-    name: "opendistroforelasticsearch-kibana{{ kibana_opendistro_version }}"
+    name: "opendistroforelasticsearch-kibana-{{ kibana_opendistro_version }}"
     state: present
   register: install
   tags: install
@@ -75,7 +75,7 @@
     - not build_from_sources
 
 - name: Kibana optimization (can take a while)
-  shell: /usr/share/kibana/node/bin/node {{ node_options }} /usr/share/kibana/src/cli --optimize -c {{ kibana_conf_path }}/kibana.yml
+  shell: /usr/share/kibana/node/bin/node {{ node_options }} /usr/share/kibana/src/cli/cli.js --optimize -c {{ kibana_conf_path }}/kibana.yml
   args:
     executable: /bin/bash
   become: yes