diff --git a/kibana/Dockerfile b/kibana/Dockerfile
index 60e5d3a9..6816c5ba 100644
--- a/kibana/Dockerfile
+++ b/kibana/Dockerfile
@@ -39,14 +39,15 @@ ENV PATTERN="" \
     WAZUH_MONITORING_FREQUENCY="" \
     WAZUH_MONITORING_SHARDS="" \
     WAZUH_MONITORING_REPLICAS="" \
-    ADMIN_PRIVILEGES=""\
-    XPACK_CANVAS="true"\
-    XPACK_LOGS="true"\
-    XPACK_INFRA="true"\
-    XPACK_ML="true"\
-    XPACK_DEVTOOLS="true"\
-    XPACK_MONITORING="true"\
-    XPACK_APM="true"
+    ADMIN_PRIVILEGES=""
+
+ARG XPACK_CANVAS="true"
+ARG XPACK_LOGS="true"
+ARG XPACK_INFRA="true"
+ARG XPACK_ML="true"
+ARG XPACK_DEVTOOLS="true"
+ARG XPACK_MONITORING="true"
+ARG XPACK_APM="true"
 
 
 COPY --chown=kibana:kibana ./config/wazuh_app_config.sh ./
@@ -61,5 +62,8 @@ COPY --chown=kibana:kibana ./config/xpack_config.sh ./
 
 RUN chmod +x ./xpack_config.sh
 
-ENTRYPOINT /entrypoint.sh
+RUN ./xpack_config.sh
 
+RUN /usr/local/bin/kibana-docker --optimize
+
+ENTRYPOINT /entrypoint.sh
diff --git a/kibana/config/entrypoint.sh b/kibana/config/entrypoint.sh
index a50c3d11..e34029b7 100644
--- a/kibana/config/entrypoint.sh
+++ b/kibana/config/entrypoint.sh
@@ -21,10 +21,6 @@ done
 
 sleep 5
 
-./xpack_config.sh 
-
 ./kibana_settings.sh &
 
-
-
 /usr/local/bin/kibana-docker