diff --git a/docs/configuration.rst b/docs/configuration.rst
index 236ffbb..f306b75 100644
--- a/docs/configuration.rst
+++ b/docs/configuration.rst
@@ -113,7 +113,7 @@ By default, a running Open edX platform deployed with Tutor includes all necessa
 Elasticsearch
 *************
 
-- ``ELASTICSEARCH_PROTOCOL`` (default: ``"http"``)
+- ``ELASTICSEARCH_SCHEME`` (default: ``"http"``)
 - ``ELASTICSEARCH_HOST`` (default: ``"elasticsearch"``)
 - ``ELASTICSEARCH_PORT`` (default: ``9200``)
 - ``ELASTICSEARCH_HEAP_SIZE`` (default: ``"1g"``)
diff --git a/tutor/templates/apps/openedx/config/cms.env.json b/tutor/templates/apps/openedx/config/cms.env.json
index 3000dcc..4ae02e3 100644
--- a/tutor/templates/apps/openedx/config/cms.env.json
+++ b/tutor/templates/apps/openedx/config/cms.env.json
@@ -26,7 +26,7 @@
   "COMPREHENSIVE_THEME_DIRS": ["/openedx/themes"],
   "STATIC_ROOT_BASE": "/openedx/staticfiles",
   "ELASTIC_SEARCH_CONFIG": [{
-    {% if ELASTICSEARCH_PROTOCOL == "https" %}"use_ssl": true,{% endif %}
+    {% if ELASTICSEARCH_SCHEME == "https" %}"use_ssl": true,{% endif %}
     "host": "{{ ELASTICSEARCH_HOST }}",
     "port": {{ ELASTICSEARCH_PORT }}
   }],
diff --git a/tutor/templates/apps/openedx/config/lms.env.json b/tutor/templates/apps/openedx/config/lms.env.json
index c3c6343..0c44495 100644
--- a/tutor/templates/apps/openedx/config/lms.env.json
+++ b/tutor/templates/apps/openedx/config/lms.env.json
@@ -32,7 +32,7 @@
   "COMPREHENSIVE_THEME_DIRS": ["/openedx/themes"],
   "STATIC_ROOT_BASE": "/openedx/staticfiles",
   "ELASTIC_SEARCH_CONFIG": [{
-    {% if ELASTICSEARCH_PROTOCOL == "https" %}"use_ssl": true,{% endif %}
+    {% if ELASTICSEARCH_SCHEME == "https" %}"use_ssl": true,{% endif %}
     "host": "{{ ELASTICSEARCH_HOST }}",
     "port": {{ ELASTICSEARCH_PORT }}
   }],
diff --git a/tutor/templates/config.yml b/tutor/templates/config.yml
index c87146b..632ff5c 100644
--- a/tutor/templates/config.yml
+++ b/tutor/templates/config.yml
@@ -43,7 +43,7 @@ DOCKER_REGISTRY: "docker.io/"
 LOCAL_PROJECT_NAME: "tutor_local"
 ELASTICSEARCH_HOST: "elasticsearch"
 ELASTICSEARCH_PORT: 9200
-ELASTICSEARCH_PROTOCOL: "http"
+ELASTICSEARCH_SCHEME: "http"
 ELASTICSEARCH_HEAP_SIZE: 1g
 FORUM_HOST: "forum"
 JWT_COMMON_AUDIENCE: "openedx"
diff --git a/tutor/templates/k8s/deployments.yml b/tutor/templates/k8s/deployments.yml
index d41d586..ab0e390 100644
--- a/tutor/templates/k8s/deployments.yml
+++ b/tutor/templates/k8s/deployments.yml
@@ -108,7 +108,7 @@ spec:
             - containerPort: 4567
           env:
             - name: SEARCH_SERVER
-              value: "{{ ELASTICSEARCH_PROTOCOL }}://{{ ELASTICSEARCH_HOST }}:{{ ELASTICSEARCH_PORT }}"
+              value: "{{ ELASTICSEARCH_SCHEME }}://{{ ELASTICSEARCH_HOST }}:{{ ELASTICSEARCH_PORT }}"
             - name: MONGODB_AUTH
               value: "{% if MONGODB_USERNAME and MONGODB_PASSWORD %}{{ MONGODB_USERNAME}}:{{ MONGODB_PASSWORD }}@{% endif %}"
             - name: MONGODB_HOST
diff --git a/tutor/templates/local/docker-compose.yml b/tutor/templates/local/docker-compose.yml
index 95eb95e..977d2b9 100644
--- a/tutor/templates/local/docker-compose.yml
+++ b/tutor/templates/local/docker-compose.yml
@@ -88,7 +88,7 @@ services:
   forum:
     image: {{ DOCKER_REGISTRY }}{{ DOCKER_IMAGE_FORUM }}
     environment:
-      SEARCH_SERVER: "{{ ELASTICSEARCH_PROTOCOL }}://{{ ELASTICSEARCH_HOST }}:{{ ELASTICSEARCH_PORT }}"
+      SEARCH_SERVER: "{{ ELASTICSEARCH_SCHEME }}://{{ ELASTICSEARCH_HOST }}:{{ ELASTICSEARCH_PORT }}"
       MONGODB_AUTH: "{% if MONGODB_USERNAME and MONGODB_PASSWORD %}{{ MONGODB_USERNAME}}:{{ MONGODB_PASSWORD }}@{% endif %}"
       MONGODB_HOST: "{{ MONGODB_HOST }}"
       MONGODB_PORT: "{{ MONGODB_PORT }}"