diff --git a/openvidu-server/deployments/enterprise/master-node/.env b/openvidu-server/deployments/enterprise/master-node/.env
index d018d2d2..2924260c 100644
--- a/openvidu-server/deployments/enterprise/master-node/.env
+++ b/openvidu-server/deployments/enterprise/master-node/.env
@@ -155,7 +155,7 @@ OPENVIDU_PRO_CLUSTER_LOAD_STRATEGY=streams
 # OPENVIDU_PRO_NETWORK_QUALITY_INTERVAL=5
 
 # If you want to use Elasticsearch and Kibana, this variable should be set to true.
-OPENVIDU_PRO_ELASTICSEARCH_ENABLED=true
+OPENVIDU_PRO_ELASTICSEARCH=true
 
 # Max days until delete indexes in state of rollover on Elasticsearch
 # Type number >= 0
diff --git a/openvidu-server/deployments/enterprise/master-node/docker-compose.yml b/openvidu-server/deployments/enterprise/master-node/docker-compose.yml
index bbea6734..dec94cae 100644
--- a/openvidu-server/deployments/enterprise/master-node/docker-compose.yml
+++ b/openvidu-server/deployments/enterprise/master-node/docker-compose.yml
@@ -46,7 +46,7 @@ services:
             - COTURN_IP=${COTURN_IP:-auto-ipv4}
             - COTURN_PORT=${COTURN_PORT:-3478}
             - OPENVIDU_PRO_CLUSTER=true
-            - OPENVIDU_PRO_ELASTICSEARCH_ENABLED=${OPENVIDU_PRO_ELASTICSEARCH_ENABLED:-true}
+            - OPENVIDU_PRO_ELASTICSEARCH=${OPENVIDU_PRO_ELASTICSEARCH:-true}
             - OPENVIDU_PRO_KIBANA_HOST=${OPENVIDU_PRO_KIBANA_HOST:-http://127.0.0.1/kibana}
             - OPENVIDU_PRO_ELASTICSEARCH_HOST=${OPENVIDU_PRO_ELASTICSEARCH_HOST:-http://127.0.0.1:9200}
             - OPENVIDU_PRO_COTURN_IN_MEDIA_NODES=${OPENVIDU_PRO_COTURN_IN_MEDIA_NODES:-false}
diff --git a/openvidu-server/deployments/enterprise/master-node/openvidu b/openvidu-server/deployments/enterprise/master-node/openvidu
index 41685de0..d80d5929 100755
--- a/openvidu-server/deployments/enterprise/master-node/openvidu
+++ b/openvidu-server/deployments/enterprise/master-node/openvidu
@@ -208,7 +208,7 @@ is_external_url() {
 
 is_elasticsearch_enabled() {
   local ELASTICSEARCH_ENABLED
-  ELASTICSEARCH_ENABLED=$(grep -v '^#' .env | grep OPENVIDU_PRO_ELASTICSEARCH_ENABLED | cut -d '=' -f2)
+  ELASTICSEARCH_ENABLED=$(grep -v '^#' .env | grep 'OPENVIDU_PRO_ELASTICSEARCH=' | cut -d '=' -f2)
 
   # First check if empty
   if [[ -z "$ELASTICSEARCH_ENABLED" ]]; then
diff --git a/openvidu-server/deployments/pro/docker-compose/mono-node/.env b/openvidu-server/deployments/pro/docker-compose/mono-node/.env
index 69b8a025..ec1f9b1f 100644
--- a/openvidu-server/deployments/pro/docker-compose/mono-node/.env
+++ b/openvidu-server/deployments/pro/docker-compose/mono-node/.env
@@ -109,7 +109,7 @@ OPENVIDU_PRO_CLUSTER_LOAD_STRATEGY=streams
 # OPENVIDU_PRO_NETWORK_QUALITY_INTERVAL=5
 
 # If you want to use Elasticsearch and Kibana, this variable should be set to true.
-OPENVIDU_PRO_ELASTICSEARCH_ENABLED=true
+OPENVIDU_PRO_ELASTICSEARCH=true
 
 # Max days until delete indexes in state of rollover on Elasticsearch
 # Type number >= 0
diff --git a/openvidu-server/deployments/pro/docker-compose/mono-node/docker-compose.yml b/openvidu-server/deployments/pro/docker-compose/mono-node/docker-compose.yml
index 6fa19fd4..ae8cb835 100644
--- a/openvidu-server/deployments/pro/docker-compose/mono-node/docker-compose.yml
+++ b/openvidu-server/deployments/pro/docker-compose/mono-node/docker-compose.yml
@@ -43,7 +43,7 @@ services:
             - COTURN_IP=${COTURN_IP:-auto-ipv4}
             - COTURN_PORT=${COTURN_PORT:-3478}
             - OPENVIDU_PRO_CLUSTER=true
-            - OPENVIDU_PRO_ELASTICSEARCH_ENABLED=${OPENVIDU_PRO_ELASTICSEARCH_ENABLED:-true}
+            - OPENVIDU_PRO_ELASTICSEARCH=${OPENVIDU_PRO_ELASTICSEARCH:-true}
             - OPENVIDU_PRO_KIBANA_HOST=${OPENVIDU_PRO_KIBANA_HOST:-http://127.0.0.1/kibana}
             - OPENVIDU_PRO_ELASTICSEARCH_HOST=${OPENVIDU_PRO_ELASTICSEARCH_HOST:-http://127.0.0.1:9200}
             - WAIT_KIBANA_URL=${OPENVIDU_PRO_KIBANA_HOST:-http://127.0.0.1/kibana}
diff --git a/openvidu-server/deployments/pro/docker-compose/mono-node/openvidu b/openvidu-server/deployments/pro/docker-compose/mono-node/openvidu
index a49545de..5b11bea6 100755
--- a/openvidu-server/deployments/pro/docker-compose/mono-node/openvidu
+++ b/openvidu-server/deployments/pro/docker-compose/mono-node/openvidu
@@ -232,7 +232,7 @@ is_external_url() {
 
 is_elasticsearch_enabled() {
   local ELASTICSEARCH_ENABLED
-  ELASTICSEARCH_ENABLED=$(grep -v '^#' .env | grep OPENVIDU_PRO_ELASTICSEARCH_ENABLED | cut -d '=' -f2)
+  ELASTICSEARCH_ENABLED=$(grep -v '^#' .env | grep 'OPENVIDU_PRO_ELASTICSEARCH=' | cut -d '=' -f2)
 
   # First check if empty
   if [[ -z "$ELASTICSEARCH_ENABLED" ]]; then
diff --git a/openvidu-server/deployments/pro/docker-compose/openvidu-server-pro/.env b/openvidu-server/deployments/pro/docker-compose/openvidu-server-pro/.env
index d1a3602b..c706eb9d 100644
--- a/openvidu-server/deployments/pro/docker-compose/openvidu-server-pro/.env
+++ b/openvidu-server/deployments/pro/docker-compose/openvidu-server-pro/.env
@@ -152,7 +152,7 @@ OPENVIDU_PRO_CLUSTER_LOAD_STRATEGY=streams
 # OPENVIDU_PRO_NETWORK_QUALITY_INTERVAL=5
 
 # If you want to use Elasticsearch and Kibana, this variable should be set to true.
-OPENVIDU_PRO_ELASTICSEARCH_ENABLED=true
+OPENVIDU_PRO_ELASTICSEARCH=true
 
 # Max days until delete indexes in state of rollover on Elasticsearch
 # Type number >= 0
diff --git a/openvidu-server/deployments/pro/docker-compose/openvidu-server-pro/docker-compose.yml b/openvidu-server/deployments/pro/docker-compose/openvidu-server-pro/docker-compose.yml
index a2784bc1..d5efa4e3 100644
--- a/openvidu-server/deployments/pro/docker-compose/openvidu-server-pro/docker-compose.yml
+++ b/openvidu-server/deployments/pro/docker-compose/openvidu-server-pro/docker-compose.yml
@@ -43,7 +43,7 @@ services:
             - COTURN_IP=${COTURN_IP:-auto-ipv4}
             - COTURN_PORT=${COTURN_PORT:-3478}
             - OPENVIDU_PRO_CLUSTER=true
-            - OPENVIDU_PRO_ELASTICSEARCH_ENABLED=${OPENVIDU_PRO_ELASTICSEARCH_ENABLED:-true}
+            - OPENVIDU_PRO_ELASTICSEARCH=${OPENVIDU_PRO_ELASTICSEARCH:-true}
             - OPENVIDU_PRO_KIBANA_HOST=${OPENVIDU_PRO_KIBANA_HOST:-http://127.0.0.1/kibana}
             - OPENVIDU_PRO_ELASTICSEARCH_HOST=${OPENVIDU_PRO_ELASTICSEARCH_HOST:-http://127.0.0.1:9200}
             - WAIT_KIBANA_URL=${OPENVIDU_PRO_KIBANA_HOST:-http://127.0.0.1/kibana}
diff --git a/openvidu-server/deployments/pro/docker-compose/openvidu-server-pro/openvidu b/openvidu-server/deployments/pro/docker-compose/openvidu-server-pro/openvidu
index 617f8e4e..3f145a76 100755
--- a/openvidu-server/deployments/pro/docker-compose/openvidu-server-pro/openvidu
+++ b/openvidu-server/deployments/pro/docker-compose/openvidu-server-pro/openvidu
@@ -208,7 +208,7 @@ is_external_url() {
 
 is_elasticsearch_enabled() {
   local ELASTICSEARCH_ENABLED
-  ELASTICSEARCH_ENABLED=$(grep -v '^#' .env | grep OPENVIDU_PRO_ELASTICSEARCH_ENABLED | cut -d '=' -f2)
+  ELASTICSEARCH_ENABLED=$(grep -v '^#' .env | grep 'OPENVIDU_PRO_ELASTICSEARCH=' | cut -d '=' -f2)
 
   # First check if empty
   if [[ -z "$ELASTICSEARCH_ENABLED" ]]; then
diff --git a/openvidu-server/docker/openvidu-server-pro/entrypoint.sh b/openvidu-server/docker/openvidu-server-pro/entrypoint.sh
index 27706891..d827dbbf 100755
--- a/openvidu-server/docker/openvidu-server-pro/entrypoint.sh
+++ b/openvidu-server/docker/openvidu-server-pro/entrypoint.sh
@@ -31,7 +31,7 @@ if [[ -z "${COTURN_SHARED_SECRET_KEY}" ]]; then
 fi
 
 # Don't wait for Kibana if Elasticsearch is disabled
-if [ "${OPENVIDU_PRO_ELASTICSEARCH_ENABLED}" == "false" ]; then
+if [ "${OPENVIDU_PRO_ELASTICSEARCH}" == "false" ]; then
     unset WAIT_KIBANA_URL
 fi