diff --git a/elasticsearch/Dockerfile b/elasticsearch/Dockerfile
index ba2da793..1a41604b 100644
--- a/elasticsearch/Dockerfile
+++ b/elasticsearch/Dockerfile
@@ -7,7 +7,7 @@ ENV ALERTS_SHARDS="1" \
 ENV API_USER="foo" \
     API_PASS="bar"
 
-ENV XPACK_ML="false" 
+ENV XPACK_ML="true" 
 
 ENV TEMPLATE_VERSION=v3.8.2
 
diff --git a/elasticsearch/config/entrypoint.sh b/elasticsearch/config/entrypoint.sh
index 525549cd..2c394cbd 100644
--- a/elasticsearch/config/entrypoint.sh
+++ b/elasticsearch/config/entrypoint.sh
@@ -19,6 +19,28 @@ run_as_other_user_if_needed() {
   fi
 }
 
+
+#Disabling xpack features
+
+elasticsearch_config_file="/usr/share/elasticsearch/config/elasticsearch.yml"
+if grep -Fq  "#xpack features" "$elasticsearch_config_file";
+then 
+  declare -A CONFIG_MAP=(
+  [xpack.ml.enabled]=$XPACK_ML
+  )
+  for i in "${!CONFIG_MAP[@]}"
+  do
+    if [ "${CONFIG_MAP[$i]}" != "" ]; then
+      sed -i 's/.'"$i"'.*/'"$i"': '"${CONFIG_MAP[$i]}"'/' $elasticsearch_config_file
+    fi
+  done
+else
+  echo "
+#xpack features
+xpack.ml.enabled: $XPACK_ML
+ " >> $elasticsearch_config_file
+fi
+
 # Run load settings script.
 
 ./load_settings.sh &
diff --git a/elasticsearch/config/load_settings.sh b/elasticsearch/config/load_settings.sh
index f844bb34..a196e766 100644
--- a/elasticsearch/config/load_settings.sh
+++ b/elasticsearch/config/load_settings.sh
@@ -68,25 +68,5 @@ curl -XPUT "$el_url/_cluster/settings" -H 'Content-Type: application/json' -d'
 }
 '
 
-#Disabling xpack features
-
-elasticsearch_config_file="/usr/share/elasticsearch/config/elasticsearch.yml"
-if grep -Fq  "#xpack features" "$elasticsearch_config_file";
-then 
-  declare -A CONFIG_MAP=(
-  [xpack.ml.enabled]=$XPACK_ML
-  )
-  for i in "${!CONFIG_MAP[@]}"
-  do
-    if [ "${CONFIG_MAP[$i]}" != "" ]; then
-      sed -i 's/.'"$i"'.*/'"$i"': '"${CONFIG_MAP[$i]}"'/' $elasticsearch_config_file
-    fi
-  done
-else
-  echo "
-#xpack features
-xpack.ml.enabled: $XPACK_ML
- " >> $elasticsearch_config_file
-fi
 
 echo "Elasticsearch is ready."
diff --git a/kibana/Dockerfile b/kibana/Dockerfile
index 8e31a057..60e5d3a9 100644
--- a/kibana/Dockerfile
+++ b/kibana/Dockerfile
@@ -40,13 +40,13 @@ ENV PATTERN="" \
     WAZUH_MONITORING_SHARDS="" \
     WAZUH_MONITORING_REPLICAS="" \
     ADMIN_PRIVILEGES=""\
-    XPACK_CANVAS="false"\
-    XPACK_LOGS="false"\
-    XPACK_INFRA="false"\
-    XPACK_ML="false"\
-    XPACK_DEVTOOLS="false"\
-    XPACK_MONITORING="false"\
-    XPACK_APM="false"
+    XPACK_CANVAS="true"\
+    XPACK_LOGS="true"\
+    XPACK_INFRA="true"\
+    XPACK_ML="true"\
+    XPACK_DEVTOOLS="true"\
+    XPACK_MONITORING="true"\
+    XPACK_APM="true"
 
 
 COPY --chown=kibana:kibana ./config/wazuh_app_config.sh ./
diff --git a/kibana/config/entrypoint.sh b/kibana/config/entrypoint.sh
index 8fcc8a78..a50c3d11 100644
--- a/kibana/config/entrypoint.sh
+++ b/kibana/config/entrypoint.sh
@@ -21,9 +21,10 @@ done
 
 sleep 5
 
+./xpack_config.sh 
+
 ./kibana_settings.sh &
 
 
-./xpack_config.sh &
 
 /usr/local/bin/kibana-docker