diff --git a/ydb/docs/en/core/_includes/codec_zstd_allow_for_olap_note.md b/ydb/docs/en/core/_includes/codec_zstd_allow_for_olap_note.md
index 6573a7beb786..1b61a55eb47b 100644
--- a/ydb/docs/en/core/_includes/codec_zstd_allow_for_olap_note.md
+++ b/ydb/docs/en/core/_includes/codec_zstd_allow_for_olap_note.md
@@ -1,4 +1,4 @@
-{% note alert %}
+{% note warning %}
 
 {% include [codec_zstd_allow_for_olap_text](codec_zstd_allow_for_olap_text.md) %}
 
diff --git a/ydb/docs/en/core/_includes/only_allow_for_olap_note.md b/ydb/docs/en/core/_includes/only_allow_for_olap_note.md
index 58ff44fa21d0..99d905a2ba86 100644
--- a/ydb/docs/en/core/_includes/only_allow_for_olap_note.md
+++ b/ydb/docs/en/core/_includes/only_allow_for_olap_note.md
@@ -1,6 +1,6 @@
 {% if oss == true and backend_name == "YDB" %}
 
-{% note alert %}
+{% note warning %}
 
 {% include [only_allow_for_olap_text](only_allow_for_olap_text.md) %}
 
diff --git a/ydb/docs/en/core/_includes/only_allow_for_oltp_note.md b/ydb/docs/en/core/_includes/only_allow_for_oltp_note.md
index 96ab849eac16..3380a5570596 100644
--- a/ydb/docs/en/core/_includes/only_allow_for_oltp_note.md
+++ b/ydb/docs/en/core/_includes/only_allow_for_oltp_note.md
@@ -1,6 +1,6 @@
 {% if oss == true and backend_name == "YDB" %}
 
-{% note alert %}
+{% note warning %}
 
 {% include [only_allow_for_oltp_text](only_allow_for_oltp_text.md) %}
 
diff --git a/ydb/docs/en/core/yql/reference/syntax/alter_table/indexes.md b/ydb/docs/en/core/yql/reference/syntax/alter_table/indexes.md
index 6d03c335a905..2d53dd9e3d66 100644
--- a/ydb/docs/en/core/yql/reference/syntax/alter_table/indexes.md
+++ b/ydb/docs/en/core/yql/reference/syntax/alter_table/indexes.md
@@ -1,11 +1,5 @@
 # Adding, removing, and renaming a index
 
-{% if oss == true and backend_name == "YDB" %}
-
-{% include [OLAP_not_allow_note](../../../../_includes/not_allow_for_olap_note.md) %}
-
-{% endif %}
-
 ## Adding an index {#add-index}
 
 `ADD INDEX` — adds an index with the specified name and type for a given set of columns. Grammar:
@@ -35,6 +29,8 @@ You can also add a secondary index using the {{ ydb-short-name }} CLI [table ind
 
 {% endif %}
 
+{% include [not_allow_for_olap](../../../../_includes/not_allow_for_olap_note.md) %}
+
 ### Examples
 
 A regular secondary index:
@@ -89,7 +85,6 @@ ALTER TABLE <table_name> ALTER INDEX <index_name> SET (<setting_name_1> = <value
 
 {% note info %}
 
-
 These settings cannot be reset.
 
 {% endnote %}
@@ -140,7 +135,6 @@ Replacement of atomic indexes under load is supported by the command [{{ ydb-cli
 
 Example of index renaming:
 
-
 ```yql
 ALTER TABLE `series` RENAME INDEX `title_index` TO `title_index_new`;
 ```
diff --git a/ydb/docs/en/core/yql/reference/syntax/create_table/secondary_index.md b/ydb/docs/en/core/yql/reference/syntax/create_table/secondary_index.md
index 015879f96734..61f2f9da204a 100644
--- a/ydb/docs/en/core/yql/reference/syntax/create_table/secondary_index.md
+++ b/ydb/docs/en/core/yql/reference/syntax/create_table/secondary_index.md
@@ -1,7 +1,5 @@
 # INDEX
 
-{% include [not_allow_for_olap](../../../../_includes/not_allow_for_olap_note.md) %}
-
 The INDEX construct is used to define a {% if concept_secondary_index %}[secondary index]({{ concept_secondary_index }}){% else %}secondary index{% endif %} in a [row-oriented](../../../../concepts/datamodel/table.md#row-oriented-tables) table:
 
 ```yql
@@ -23,6 +21,8 @@ where:
 
 {% include [index_grammar_explanation.md](../_includes/index_grammar_explanation.md) %}
 
+{% include [not_allow_for_olap](../../../../_includes/not_allow_for_olap_note.md) %}
+
 ## Example
 
 ```yql
diff --git a/ydb/docs/en/core/yql/reference/syntax/create_table/vector_index.md b/ydb/docs/en/core/yql/reference/syntax/create_table/vector_index.md
index 6041ada08245..d16d3cea72b3 100644
--- a/ydb/docs/en/core/yql/reference/syntax/create_table/vector_index.md
+++ b/ydb/docs/en/core/yql/reference/syntax/create_table/vector_index.md
@@ -1,7 +1,5 @@
 # Vector index
 
-{% include [not_allow_for_olap](../../../../_includes/not_allow_for_olap_note.md) %}
-
 [Vector index](../../../../concepts/glossary.md#vector-index) in [row-oriented](../../../../concepts/datamodel/table.md#row-oriented-tables) tables is created using the same syntax as [secondary indexes](secondary_index.md), by specifying `vector_kmeans_tree` as the index type. Subset of syntax available for vector indexes:
 
 ```yql
@@ -34,6 +32,8 @@ Where:
 
 {% endnote %}
 
+{% include [not_allow_for_olap](../../../../_includes/not_allow_for_olap_note.md) %}
+
 ## Example
 
 ```yql
diff --git a/ydb/docs/en/core/yql/reference/syntax/select/secondary_index.md b/ydb/docs/en/core/yql/reference/syntax/select/secondary_index.md
index 12f4cf948db9..5e5b22937b57 100644
--- a/ydb/docs/en/core/yql/reference/syntax/select/secondary_index.md
+++ b/ydb/docs/en/core/yql/reference/syntax/select/secondary_index.md
@@ -1,19 +1,5 @@
 # VIEW (INDEX)
 
-{% if oss == true and backend_name == "YDB" %}
-
-{% if oss == true and backend_name == "YDB" %}
-
-{% note warning %}
-
-{% include [OLAP_not_allow_text](../../../../_includes/not_allow_for_olap_text.md) %}
-
-{% endnote %}
-
-{% endif %}
-
-{% endif %}
-
 To make a `SELECT` by secondary index of row-oriented table statement, use the following:
 
 ```yql
@@ -22,6 +8,8 @@ SELECT *
     WHERE …
 ```
 
+{% include [not_allow_for_olap](../../../../_includes/not_allow_for_olap_note.md) %}
+
 ## Examples
 
 * Select all the fields from the `series` row-oriented table using the `views_index` index with the `views >=someValue` criteria:
diff --git a/ydb/docs/en/core/yql/reference/syntax/select/vector_index.md b/ydb/docs/en/core/yql/reference/syntax/select/vector_index.md
index 5f85efaf23a6..5bb5fa80ab3a 100644
--- a/ydb/docs/en/core/yql/reference/syntax/select/vector_index.md
+++ b/ydb/docs/en/core/yql/reference/syntax/select/vector_index.md
@@ -1,15 +1,5 @@
 # VIEW (Vector index)
 
-{% if oss == true and backend_name == "YDB" %}
-
-{% note warning %}
-
-{% include [OLAP_not_allow_text](../../../../_includes/not_allow_for_olap_text.md) %}
-
-{% endnote %}
-
-{% endif %}
-
 To select data from a row-oriented table using a [vector index](../../../../concepts/glossary.md#vector-index), use the following statements:
 
 ```yql
diff --git a/ydb/docs/ru/core/_includes/codec_zstd_allow_for_olap_note.md b/ydb/docs/ru/core/_includes/codec_zstd_allow_for_olap_note.md
index 6573a7beb786..1b61a55eb47b 100644
--- a/ydb/docs/ru/core/_includes/codec_zstd_allow_for_olap_note.md
+++ b/ydb/docs/ru/core/_includes/codec_zstd_allow_for_olap_note.md
@@ -1,4 +1,4 @@
-{% note alert %}
+{% note warning %}
 
 {% include [codec_zstd_allow_for_olap_text](codec_zstd_allow_for_olap_text.md) %}
 
diff --git a/ydb/docs/ru/core/_includes/not_allow_for_olap_note.md b/ydb/docs/ru/core/_includes/not_allow_for_olap_note.md
index 4f59bd3872f9..b231e64d1ea9 100644
--- a/ydb/docs/ru/core/_includes/not_allow_for_olap_note.md
+++ b/ydb/docs/ru/core/_includes/not_allow_for_olap_note.md
@@ -1,6 +1,6 @@
 {% if oss == true and backend_name == "YDB" %}
 
-{% note alert %}
+{% note warning %}
 
 {% include [not_allow_for_olap_text](not_allow_for_olap_text.md) %}
 
diff --git a/ydb/docs/ru/core/_includes/not_allow_for_olap_note_main.md b/ydb/docs/ru/core/_includes/not_allow_for_olap_note_main.md
index 03929e336dc0..b1c888d1cb04 100644
--- a/ydb/docs/ru/core/_includes/not_allow_for_olap_note_main.md
+++ b/ydb/docs/ru/core/_includes/not_allow_for_olap_note_main.md
@@ -1,4 +1,4 @@
-{% note alert %}
+{% note warning %}
 
 {% include [not_allow_for_olap_text](not_allow_for_olap_text.md) %}
 
diff --git a/ydb/docs/ru/core/_includes/not_allow_for_oltp_note.md b/ydb/docs/ru/core/_includes/not_allow_for_oltp_note.md
index c45b7f34ab9f..9969f2d4ae80 100644
--- a/ydb/docs/ru/core/_includes/not_allow_for_oltp_note.md
+++ b/ydb/docs/ru/core/_includes/not_allow_for_oltp_note.md
@@ -1,6 +1,6 @@
 {% if oss == true and backend_name == "YDB" %}
 
-{% note alert %}
+{% note warning %}
 
 {% include [not_allow_for_olap_text](not_allow_for_oltp_text.md) %}
 
diff --git a/ydb/docs/ru/core/_includes/only_allow_for_olap_note.md b/ydb/docs/ru/core/_includes/only_allow_for_olap_note.md
index bf118fc2b7fa..b8731d60d7b5 100644
--- a/ydb/docs/ru/core/_includes/only_allow_for_olap_note.md
+++ b/ydb/docs/ru/core/_includes/only_allow_for_olap_note.md
@@ -1,6 +1,6 @@
 {% if oss == true and backend_name == "YDB" %}
 
-{% note alert %}
+{% note warning %}
 
 {% include [only_allow_for_olap_text](only_allow_for_olap_text.md) %}
 
diff --git a/ydb/docs/ru/core/_includes/only_allow_for_oltp_note.md b/ydb/docs/ru/core/_includes/only_allow_for_oltp_note.md
index c9eae0746375..07dda13db275 100644
--- a/ydb/docs/ru/core/_includes/only_allow_for_oltp_note.md
+++ b/ydb/docs/ru/core/_includes/only_allow_for_oltp_note.md
@@ -1,6 +1,6 @@
 {% if oss == true and backend_name == "YDB" %}
 
-{% note alert %}
+{% note warning %}
 
 {% include [only_allow_for_oltp_text](only_allow_for_oltp_text.md) %}
 
diff --git a/ydb/docs/ru/core/yql/reference/syntax/alter_table/indexes.md b/ydb/docs/ru/core/yql/reference/syntax/alter_table/indexes.md
index f5934fabc277..087c331942a0 100644
--- a/ydb/docs/ru/core/yql/reference/syntax/alter_table/indexes.md
+++ b/ydb/docs/ru/core/yql/reference/syntax/alter_table/indexes.md
@@ -1,11 +1,5 @@
 # Добавление, удаление и переименование индекса
 
-{% if oss == true and backend_name == "YDB" %}
-
-{% include [OLAP_not_allow_note](../../../../_includes/not_allow_for_olap_note.md) %}
-
-{% endif %}
-
 ## Добавление индекса {#add-index}
 
 `ADD INDEX` — добавляет индекс с указанным именем и типом для заданного набора колонок в {% if backend_name == "YDB" and oss == true %}строковых таблицах.{% else %}таблицах.{% endif %} Грамматика:
@@ -35,6 +29,8 @@ ALTER TABLE `<table_name>`
 
 {% endif %}
 
+{% include [not_allow_for_olap](../../../../_includes/not_allow_for_olap_note.md) %}
+
 ### Примеры
 
 Вторичный индекс:
diff --git a/ydb/docs/ru/core/yql/reference/syntax/create_table/secondary_index.md b/ydb/docs/ru/core/yql/reference/syntax/create_table/secondary_index.md
index c58d34f57769..983dd3482574 100644
--- a/ydb/docs/ru/core/yql/reference/syntax/create_table/secondary_index.md
+++ b/ydb/docs/ru/core/yql/reference/syntax/create_table/secondary_index.md
@@ -1,11 +1,5 @@
 # INDEX
 
-{% if backend_name == "YDB" and oss == true %}
-
-{% include [not_allow_for_olap](../../../../_includes/not_allow_for_olap_note.md) %}
-
-{% endif %}
-
 Конструкция `INDEX` используется для определения {% if concept_secondary_index %}[вторичного индекса]({{ concept_secondary_index }}){% else %}вторичного индекса{% endif %} {% if backend_name == "YDB" and oss == true %}для [строковых](../../../../concepts/datamodel/table.md#row-oriented-tables) таблиц{% else %}на таблице{% endif %}:
 
 ```yql
diff --git a/ydb/docs/ru/core/yql/reference/syntax/create_table/vector_index.md b/ydb/docs/ru/core/yql/reference/syntax/create_table/vector_index.md
index 6ef60df33869..6d32eca4bcfe 100644
--- a/ydb/docs/ru/core/yql/reference/syntax/create_table/vector_index.md
+++ b/ydb/docs/ru/core/yql/reference/syntax/create_table/vector_index.md
@@ -1,11 +1,5 @@
 # Векторный индекс
 
-{% if backend_name == "YDB" and oss == true %}
-
-{% include [not_allow_for_olap](../../../../_includes/not_allow_for_olap_note.md) %}
-
-{% endif %}
-
 {% if backend_name == 'YDB' %}[Векторный индекс](../../../../concepts/glossary.md#vector-index){% else %}векторный индекс{% endif %} в {% if backend_name == 'YDB' %}[строковых](../../../../concepts/datamodel/table.md#row-oriented-tables){% else %}строковых{% endif %} таблицах создаётся с помощью того же синтаксиса, что и [вторичные индексы](secondary_index.md), при указании `vector_kmeans_tree` в качестве типа индекса. Подмножество доступного для векторных индексов синтаксиса:
 
 ```yql
@@ -38,6 +32,8 @@ CREATE TABLE `<table_name>` (
 
 {% endnote %}
 
+{% include [not_allow_for_olap](../../../../_includes/not_allow_for_olap_note.md) %}
+
 ## Пример
 
 ```yql
diff --git a/ydb/docs/ru/core/yql/reference/syntax/select/secondary_index.md b/ydb/docs/ru/core/yql/reference/syntax/select/secondary_index.md
index 61b39b68a8d3..969dc2e6534f 100644
--- a/ydb/docs/ru/core/yql/reference/syntax/select/secondary_index.md
+++ b/ydb/docs/ru/core/yql/reference/syntax/select/secondary_index.md
@@ -1,11 +1,5 @@
 # VIEW (INDEX)
 
-{% if oss == true and backend_name == "YDB" %}
-
-{% include [olap_warning_note](../../../../_includes/not_allow_for_olap_note.md) %}
-
-{% endif %}
-
 Чтобы сделать запрос `SELECT` по вторичному индексу строковой таблицы, используйте конструкцию:
 
 ```yql
@@ -14,6 +8,8 @@ SELECT *
     WHERE …
 ```
 
+{% include [not_allow_for_olap](../../../../_includes/not_allow_for_olap_note.md) %}
+
 ## Примеры
 
 Выбрать все поля из строковой таблицы `series` по индексу `views_index` с условием `views >= someValue`:
diff --git a/ydb/docs/ru/core/yql/reference/syntax/select/vector_index.md b/ydb/docs/ru/core/yql/reference/syntax/select/vector_index.md
index 863018da423c..804edfff0003 100644
--- a/ydb/docs/ru/core/yql/reference/syntax/select/vector_index.md
+++ b/ydb/docs/ru/core/yql/reference/syntax/select/vector_index.md
@@ -1,15 +1,5 @@
 # VIEW (Векторный индекс)
 
-{% if oss == true and backend_name == "YDB" %}
-
-{% note warning %}
-
-{% include [OLAP_not_allow_text](../../../../_includes/not_allow_for_olap_text.md) %}
-
-{% endnote %}
-
-{% endif %}
-
 Для выполнения запроса `SELECT` с использованием [векторного индекса](../../../../concepts/glossary.md#vector-index) в строчно-ориентированной таблице используйте следующий синтаксис:
 
 ```yql