diff --git a/cookiecutter.json b/cookiecutter.json
index d56cffbf41cbbbb57f4c8a0285829c76df897890..ca30c04b03cf250102d6a49a58d5c520751477c0 100644
--- a/cookiecutter.json
+++ b/cookiecutter.json
@@ -16,7 +16,7 @@
     true,
     false
   ],
-  "add_elastic": [
+  "add_elastic_search": [
     true,
     false
   ],
diff --git a/{{cookiecutter.project_name}}/conditional_files.json b/{{cookiecutter.project_name}}/conditional_files.json
index d755a9d7738adb9215c7766ce08d50b98149d8fc..ce4d22d3c618e8c28664a256157e7b1c97013d8d 100644
--- a/{{cookiecutter.project_name}}/conditional_files.json
+++ b/{{cookiecutter.project_name}}/conditional_files.json
@@ -35,7 +35,7 @@
     },
     {
       "name": "Elastic search",
-      "enabled": "{{cookiecutter.add_elastic|lower}}",
+      "enabled": "{{cookiecutter.add_elastic_search|lower}}",
       "resources": [
         "src/services/elastic"
       ]
diff --git a/{{cookiecutter.project_name}}/docker-compose.prod.yml b/{{cookiecutter.project_name}}/docker-compose.prod.yml
index 1ed7b83a7ca9f5c96e3a451f10b5fe59d845d50c..dcb47c2b44d561e34488b90905657f4ec9071994 100644
--- a/{{cookiecutter.project_name}}/docker-compose.prod.yml
+++ b/{{cookiecutter.project_name}}/docker-compose.prod.yml
@@ -57,7 +57,7 @@ services:
       - {{ cookiecutter.project_name }}_network
   {% endif %}
 
-  {% if cookiecutter.add_elastic == "True" -%}
+  {% if cookiecutter.add_elastic_search == "True" -%}
   es:
     restart: always
     container_name: {{ cookiecutter.project_name }}_es_dev
diff --git a/{{cookiecutter.project_name}}/docker-compose.yml b/{{cookiecutter.project_name}}/docker-compose.yml
index 8888331c425edb42ef3642366f6a2ecdafc360b8..7f201dfee735f9e845c428291c3bf3317c599306 100644
--- a/{{cookiecutter.project_name}}/docker-compose.yml
+++ b/{{cookiecutter.project_name}}/docker-compose.yml
@@ -65,7 +65,7 @@ services:
       - {{ cookiecutter.project_name }}_network_dev
   {% endif %}
 
-  {% if cookiecutter.add_elastic == "True" -%}
+  {% if cookiecutter.add_elastic_search == "True" -%}
   es:
     restart: always
     container_name: {{ cookiecutter.project_name }}_es_dev
diff --git a/{{cookiecutter.project_name}}/envs/.env b/{{cookiecutter.project_name}}/envs/.env
index 9a9fab0189aff9b4165ebaac3ff9d792c30fed92..4c2e415347b362d53df3e02c62fbfa76e09f1df7 100644
--- a/{{cookiecutter.project_name}}/envs/.env
+++ b/{{cookiecutter.project_name}}/envs/.env
@@ -12,6 +12,6 @@ REDIS_PORT=6379
 {% if cookiecutter.add_scheduler == "True" -%}
 SCHEDULE_TIMER=20
 {% endif %}
-{% if cookiecutter.add_elastic == "True" -%}
+{% if cookiecutter.add_elastic_search == "True" -%}
 ELASTIC_HOST=http://es:9200
 {% endif %}
\ No newline at end of file
diff --git a/{{cookiecutter.project_name}}/envs/example.env b/{{cookiecutter.project_name}}/envs/example.env
index 469d2c6bf3f0b94c4849e25a8ce4d18aacfc6cf3..f4ffb553937a638056e93405f712132ae3e24b56 100644
--- a/{{cookiecutter.project_name}}/envs/example.env
+++ b/{{cookiecutter.project_name}}/envs/example.env
@@ -13,6 +13,6 @@ HTTPBIN_HOST=https://httpbin.org/
 {% if cookiecutter.add_scheduler == "True" -%}
 SCHEDULE_TIMER=20
 {% endif %}
-{% if cookiecutter.add_elastic == "True" -%}
+{% if cookiecutter.add_elastic_search == "True" -%}
 ELASTIC_HOST=http://es:9200
 {% endif %}
\ No newline at end of file
diff --git a/{{cookiecutter.project_name}}/envs/test.env b/{{cookiecutter.project_name}}/envs/test.env
index 8cc07f19ea2126a89ec1b9a0313b1500a8803142..96a9cb7885dfe8ef970dbb52324a48829c592ac9 100644
--- a/{{cookiecutter.project_name}}/envs/test.env
+++ b/{{cookiecutter.project_name}}/envs/test.env
@@ -13,6 +13,6 @@ HTTPBIN_HOST=https://httpbin.org/
 {% if cookiecutter.add_scheduler == "True" -%}
 SCHEDULE_TIMER=20
 {% endif %}
-{% if cookiecutter.add_elastic == "True" -%}
+{% if cookiecutter.add_elastic_search == "True" -%}
 ELASTIC_HOST=http://es:9200
 {% endif %}
\ No newline at end of file
diff --git a/{{cookiecutter.project_name}}/migrations/versions/7ae297ab5ac1_created_dummy_model.py b/{{cookiecutter.project_name}}/migrations/versions/7ae297ab5ac1_created_dummy_model.py
index d55c3718394ba65a61224bfaa882dcf96e47b96f..3b1e426b13b03d2349b96c7f687389fe840c735d 100644
--- a/{{cookiecutter.project_name}}/migrations/versions/7ae297ab5ac1_created_dummy_model.py
+++ b/{{cookiecutter.project_name}}/migrations/versions/7ae297ab5ac1_created_dummy_model.py
@@ -22,7 +22,7 @@ def upgrade():
                     sa.Column('id', postgresql.UUID(as_uuid=True), nullable=False),
                     sa.Column('name', sa.String(), nullable=False),
                     sa.Column('surname', sa.String(), nullable=False),
-                    {% if cookiecutter.add_elastic == "True" -%}sa.Column('tags', sa.String(), nullable=False, default=""),{% endif %}
+                    {% if cookiecutter.add_elastic_search == "True" -%}sa.Column('tags', sa.String(), nullable=False, default=""),{% endif %}
                     sa.Column('created_at', sa.DateTime(timezone=True), server_default=sa.text('clock_timestamp()'),
                               nullable=False),
                     sa.Column('updated_at', sa.DateTime(timezone=True), server_default=sa.text('clock_timestamp()'),
diff --git a/{{cookiecutter.project_name}}/pyproject.toml b/{{cookiecutter.project_name}}/pyproject.toml
index d4bcc2dc8718c030338811164d9d04885e8b78af..811eab585f814e381c56db22f25909e18f00971c 100644
--- a/{{cookiecutter.project_name}}/pyproject.toml
+++ b/{{cookiecutter.project_name}}/pyproject.toml
@@ -19,7 +19,7 @@ aiopg = "^1.0.0"
 {% if cookiecutter.add_redis == "True" -%}
 aioredis = "^1.3.1"
 {% endif %}
-{% if cookiecutter.add_elastic == "True" -%}
+{% if cookiecutter.add_elastic_search == "True" -%}
 elasticsearch-dsl = "^7.3.0"
 elasticsearch = {extras = ["async"], version = "^7.9.1"}
 {% endif %}
diff --git a/{{cookiecutter.project_name}}/src/api/dummy_db/routes.py b/{{cookiecutter.project_name}}/src/api/dummy_db/routes.py
index 12f7adcb99513874c1bf7ccb7d5a48f7a871b1d4..9f4569308ed83f5119a87532c4c87f7f3bfb0410 100644
--- a/{{cookiecutter.project_name}}/src/api/dummy_db/routes.py
+++ b/{{cookiecutter.project_name}}/src/api/dummy_db/routes.py
@@ -7,7 +7,7 @@ from src.api.dummy_db.schema import (
     UpdateDummyModel,
     GetDummyResponse,
 )
-{% if cookiecutter.add_elastic == "True" -%}
+{% if cookiecutter.add_elastic_search == "True" -%}
 from src.api.dummy_db.schema import DummyElasticResponse, ElasticAdd
 from src.services.elastic.schema import ElasticFilterModel
 {%else%}
@@ -22,8 +22,8 @@ URL_PREFIX = "/dummy_db_obj"
 
 
 @router.put("/")
-async def create_dummy(dummy_obj: {% if cookiecutter.add_elastic == "True" -%}ElasticAdd{% else %}BaseDummyModel{% endif %}, session: Session = Depends(db_session)) -> None:
-    {% if cookiecutter.add_elastic == "True" -%}
+async def create_dummy(dummy_obj: {% if cookiecutter.add_elastic_search == "True" -%}ElasticAdd{% else %}BaseDummyModel{% endif %}, session: Session = Depends(db_session)) -> None:
+    {% if cookiecutter.add_elastic_search == "True" -%}
     insert_query = DummyDBModel.create(**dummy_obj.dict()).returning(DummyDBModel.id)
     model_id = await session.scalar(insert_query)
     await DummyDBModel.elastic_add(
@@ -41,7 +41,7 @@ async def update_dummy_model(
         session: Session = Depends(db_session)
 ) -> None:
     await session.execute(DummyDBModel.update(dummy_id, **new_values.dict()))
-    {% if cookiecutter.add_elastic == "True" -%}
+    {% if cookiecutter.add_elastic_search == "True" -%}
     await DummyDBModel.elastic_update(
         model_id=dummy_id,
         **new_values.dict(exclude_unset=True)
@@ -52,7 +52,7 @@ async def update_dummy_model(
 @router.delete("/{dummy_id}")
 async def delete_dummy_model(dummy_id: uuid.UUID, session: Session = Depends(db_session)) -> None:
     await session.execute(DummyDBModel.delete(dummy_id))
-    {% if cookiecutter.add_elastic == "True" -%}
+    {% if cookiecutter.add_elastic_search == "True" -%}
     await DummyDBModel.elastic_delete(model_id=dummy_id)
     {% endif %}
 
@@ -74,7 +74,7 @@ async def filter_dummy_models(
         results=results
     )
 
-{% if cookiecutter.add_elastic == "True" -%}
+{% if cookiecutter.add_elastic_search == "True" -%}
 @router.get("/elastic", response_model=DummyElasticResponse)
 async def dummy_elastic_filter(query: ElasticFilterModel = Depends(ElasticFilterModel)) -> DummyElasticResponse:
     results = await DummyDBModel.elastic_filter(**query.dict())
diff --git a/{{cookiecutter.project_name}}/src/api/dummy_db/schema.py b/{{cookiecutter.project_name}}/src/api/dummy_db/schema.py
index d367ecb64611c13f190f66ecfd0d4b60c1ce71d2..aec457a6e62f3692ce131dd3f32bee82e5313ad5 100644
--- a/{{cookiecutter.project_name}}/src/api/dummy_db/schema.py
+++ b/{{cookiecutter.project_name}}/src/api/dummy_db/schema.py
@@ -23,7 +23,7 @@ class ReturnDummyModel(BaseDummyModel):
 class GetDummyResponse(BaseModel):
     results: List[ReturnDummyModel]
 
-{% if cookiecutter.add_elastic == "True" -%}
+{% if cookiecutter.add_elastic_search == "True" -%}
 class DummyElasticResponse(BaseModel):
     results: List[DummyElasticFilter]
 
@@ -34,7 +34,7 @@ class ElasticAdd(BaseDummyModel):
 class UpdateDummyModel(BaseModel):
     name: Optional[str] = Field(default=None, example="New name")
     surname: Optional[str] = Field(default=None, example="New surname")
-    {% if cookiecutter.add_elastic == "True" -%}
+    {% if cookiecutter.add_elastic_search == "True" -%}
     tags: Optional[str] = Field(default=None, example="tag1,tag2")
     {% endif %}
 
diff --git a/{{cookiecutter.project_name}}/src/models/dummy_db_model.py b/{{cookiecutter.project_name}}/src/models/dummy_db_model.py
index 90215f455ecc5b1c1379b31eab55017d08008d2b..b49086f2f034be795b5fa0c7cf5ad73bdfcfa7f8 100644
--- a/{{cookiecutter.project_name}}/src/models/dummy_db_model.py
+++ b/{{cookiecutter.project_name}}/src/models/dummy_db_model.py
@@ -2,22 +2,22 @@ import uuid
 from typing import Optional
 
 from sqlalchemy import Column, String, sql
-{% if cookiecutter.add_elastic == "True" -%}
+{% if cookiecutter.add_elastic_search == "True" -%}
 from src.services.elastic import ElasticModelMixin
 from src.services.elastic.schema import ESReturnModel
 {% endif %}
 from src.services.db import Base
 
-{% if cookiecutter.add_elastic == "True" -%}
+{% if cookiecutter.add_elastic_search == "True" -%}
 class DummyElasticFilter(ESReturnModel):
     name: str
     surname: str
 {% endif %}
 
-class DummyDBModel(Base{% if cookiecutter.add_elastic == "True" -%}, ElasticModelMixin[DummyElasticFilter]{% endif %}):
+class DummyDBModel(Base{% if cookiecutter.add_elastic_search == "True" -%}, ElasticModelMixin[DummyElasticFilter]{% endif %}):
     name = Column(String, nullable=False, index=True)
     surname = Column(String, nullable=False, index=True)
-    {% if cookiecutter.add_elastic == "True" -%}
+    {% if cookiecutter.add_elastic_search == "True" -%}
     tags = Column(String, nullable=False, default="")
 
     __es_index_name = "dummy_elastic_index"
@@ -31,12 +31,12 @@ class DummyDBModel(Base{% if cookiecutter.add_elastic == "True" -%}, ElasticMode
             *,
             name: str,
             surname: str,
-            {% if cookiecutter.add_elastic == "True" -%}tags: str = "",{% endif %}
+            {% if cookiecutter.add_elastic_search == "True" -%}tags: str = "",{% endif %}
     ) -> sql.Insert:
         return cls.insert_query(
             name=name,
             surname=surname,
-            {% if cookiecutter.add_elastic == "True" -%}tags=tags,{% endif %}
+            {% if cookiecutter.add_elastic_search == "True" -%}tags=tags,{% endif %}
         )
 
     @classmethod
@@ -49,7 +49,7 @@ class DummyDBModel(Base{% if cookiecutter.add_elastic == "True" -%}, ElasticMode
                *,
                name: Optional[str] = None,
                surname: Optional[str] = None,
-               {% if cookiecutter.add_elastic == "True" -%}tags: Optional[str] = None,{% endif %}
+               {% if cookiecutter.add_elastic_search == "True" -%}tags: Optional[str] = None,{% endif %}
                ) -> sql.Update:
         new_values = {}
         if name:
diff --git a/{{cookiecutter.project_name}}/src/settings.py b/{{cookiecutter.project_name}}/src/settings.py
index 8b66172436fbfba5bfc66d5ad778d0686eb838ff..73121a369fce2afe4d25ffdc550af24fd35684e7 100644
--- a/{{cookiecutter.project_name}}/src/settings.py
+++ b/{{cookiecutter.project_name}}/src/settings.py
@@ -32,7 +32,7 @@ class Settings(BaseSettings):
     {% endif %}
     # httpbin client settings
     httpbin_host: str = Field(default="https://httpbin.org/")
-    {% if cookiecutter.add_elastic == "True" -%}
+    {% if cookiecutter.add_elastic_search == "True" -%}
     elastic_host: str = Field(...)
     {% endif %}