diff --git a/docs/about/introduction/knowledge-model/knowledge-model-schema.png b/docs/about/introduction/knowledge-model/knowledge-model-schema.png
index 1c90ea0..2d1034a 100644
Binary files a/docs/about/introduction/knowledge-model/knowledge-model-schema.png and b/docs/about/introduction/knowledge-model/knowledge-model-schema.png differ
diff --git a/docs/application/administration/locales/detail/detail.png b/docs/application/administration/locales/detail/detail.png
index 5952d86..8370e65 100644
Binary files a/docs/application/administration/locales/detail/detail.png and b/docs/application/administration/locales/detail/detail.png differ
diff --git a/docs/application/administration/locales/import/registry.png b/docs/application/administration/locales/import/registry.png
index fda27ee..8c09f1f 100644
Binary files a/docs/application/administration/locales/import/registry.png and b/docs/application/administration/locales/import/registry.png differ
diff --git a/docs/application/administration/locales/index/list.png b/docs/application/administration/locales/index/list.png
index 2f4fbc6..b4ebf67 100644
Binary files a/docs/application/administration/locales/index/list.png and b/docs/application/administration/locales/index/list.png differ
diff --git a/docs/application/administration/settings/info/usage/usage.png b/docs/application/administration/settings/info/usage/usage.png
index d8d5c5b..8b37a67 100644
Binary files a/docs/application/administration/settings/info/usage/usage.png and b/docs/application/administration/settings/info/usage/usage.png differ
diff --git a/docs/application/administration/users/create/create.png b/docs/application/administration/users/create/create.png
index 1ec99e6..86916e7 100644
Binary files a/docs/application/administration/users/create/create.png and b/docs/application/administration/users/create/create.png differ
diff --git a/docs/application/document-templates/editors/detail/publish/modal.png b/docs/application/document-templates/editors/detail/publish/modal.png
index f02c6d8..cbad241 100644
Binary files a/docs/application/document-templates/editors/detail/publish/modal.png and b/docs/application/document-templates/editors/detail/publish/modal.png differ
diff --git a/docs/application/document-templates/editors/detail/template/formats.png b/docs/application/document-templates/editors/detail/template/formats.png
index 2c595ec..be81320 100644
Binary files a/docs/application/document-templates/editors/detail/template/formats.png and b/docs/application/document-templates/editors/detail/template/formats.png differ
diff --git a/docs/application/document-templates/list/detail/detail.png b/docs/application/document-templates/list/detail/detail.png
index e512561..9257146 100644
Binary files a/docs/application/document-templates/list/detail/detail.png and b/docs/application/document-templates/list/detail/detail.png differ
diff --git a/docs/application/document-templates/list/index/list.png b/docs/application/document-templates/list/index/list.png
index 97258f5..73501e2 100644
Binary files a/docs/application/document-templates/list/index/list.png and b/docs/application/document-templates/list/index/list.png differ
diff --git a/docs/application/knowledge-models/editors/detail/index/knowledge-model-editor.png b/docs/application/knowledge-models/editors/detail/index/knowledge-model-editor.png
index ad93f3d..9fcf4c4 100644
Binary files a/docs/application/knowledge-models/editors/detail/index/knowledge-model-editor.png and b/docs/application/knowledge-models/editors/detail/index/knowledge-model-editor.png differ
diff --git a/docs/application/knowledge-models/editors/detail/knowledge-model/navigation.png b/docs/application/knowledge-models/editors/detail/knowledge-model/navigation.png
index fb16719..cc52740 100644
Binary files a/docs/application/knowledge-models/editors/detail/knowledge-model/navigation.png and b/docs/application/knowledge-models/editors/detail/knowledge-model/navigation.png differ
diff --git a/docs/application/knowledge-models/editors/detail/preview/preview.png b/docs/application/knowledge-models/editors/detail/preview/preview.png
index b044383..f834f28 100644
Binary files a/docs/application/knowledge-models/editors/detail/preview/preview.png and b/docs/application/knowledge-models/editors/detail/preview/preview.png differ
diff --git a/docs/application/knowledge-models/list/detail/detail.png b/docs/application/knowledge-models/list/detail/detail.png
index 79f8755..c3d3132 100644
Binary files a/docs/application/knowledge-models/list/detail/detail.png and b/docs/application/knowledge-models/list/detail/detail.png differ
diff --git a/docs/application/knowledge-models/list/index/list.png b/docs/application/knowledge-models/list/index/list.png
index 77659b7..1a17600 100644
Binary files a/docs/application/knowledge-models/list/index/list.png and b/docs/application/knowledge-models/list/index/list.png differ
diff --git a/docs/application/knowledge-models/secrets/secrets.png b/docs/application/knowledge-models/secrets/secrets.png
index 7869c66..54e8e61 100644
Binary files a/docs/application/knowledge-models/secrets/secrets.png and b/docs/application/knowledge-models/secrets/secrets.png differ
diff --git a/docs/application/profile/about/modal.png b/docs/application/profile/about/modal.png
index 0b669df..8351d18 100644
Binary files a/docs/application/profile/about/modal.png and b/docs/application/profile/about/modal.png differ
diff --git a/docs/application/profile/assigned-comments/list.png b/docs/application/profile/assigned-comments/list.png
index 825dc96..e117592 100644
Binary files a/docs/application/profile/assigned-comments/list.png and b/docs/application/profile/assigned-comments/list.png differ
diff --git a/docs/application/profile/index/menu.png b/docs/application/profile/index/menu.png
index 2129701..00096d3 100644
Binary files a/docs/application/profile/index/menu.png and b/docs/application/profile/index/menu.png differ
diff --git a/docs/application/profile/settings/active-sessions/form.png b/docs/application/profile/settings/active-sessions/form.png
index 44cc2a2..c1badba 100644
Binary files a/docs/application/profile/settings/active-sessions/form.png and b/docs/application/profile/settings/active-sessions/form.png differ
diff --git a/docs/application/projects/documents/documents.png b/docs/application/projects/documents/documents.png
index fa2a7dd..3c147e0 100644
Binary files a/docs/application/projects/documents/documents.png and b/docs/application/projects/documents/documents.png differ
diff --git a/docs/application/projects/files/files.png b/docs/application/projects/files/files.png
index 9e45c6a..224cb76 100644
Binary files a/docs/application/projects/files/files.png and b/docs/application/projects/files/files.png differ
diff --git a/docs/application/projects/importers/importers.png b/docs/application/projects/importers/importers.png
index aa1f142..7893ed5 100644
Binary files a/docs/application/projects/importers/importers.png and b/docs/application/projects/importers/importers.png differ
diff --git a/docs/application/projects/list/create/project-create-custom.png b/docs/application/projects/list/create/project-create-custom.png
index 9f02a96..6a0971d 100644
Binary files a/docs/application/projects/list/create/project-create-custom.png and b/docs/application/projects/list/create/project-create-custom.png differ
diff --git a/docs/application/projects/list/detail/documents/list.png b/docs/application/projects/list/detail/documents/list.png
index b96849a..c7e1a0c 100644
Binary files a/docs/application/projects/list/detail/documents/list.png and b/docs/application/projects/list/detail/documents/list.png differ
diff --git a/docs/application/projects/list/detail/documents/new.png b/docs/application/projects/list/detail/documents/new.png
index eb62b3b..963d7cb 100644
Binary files a/docs/application/projects/list/detail/documents/new.png and b/docs/application/projects/list/detail/documents/new.png differ
diff --git a/docs/application/projects/list/detail/files/files.png b/docs/application/projects/list/detail/files/files.png
index 909bf10..196d32b 100644
Binary files a/docs/application/projects/list/detail/files/files.png and b/docs/application/projects/list/detail/files/files.png differ
diff --git a/docs/application/projects/list/detail/index/questionnaire.png b/docs/application/projects/list/detail/index/questionnaire.png
index 2516a29..fb468cc 100644
Binary files a/docs/application/projects/list/detail/index/questionnaire.png and b/docs/application/projects/list/detail/index/questionnaire.png differ
diff --git a/docs/application/projects/list/detail/metrics/metrics.png b/docs/application/projects/list/detail/metrics/metrics.png
index 280a880..5a9fc5e 100644
Binary files a/docs/application/projects/list/detail/metrics/metrics.png and b/docs/application/projects/list/detail/metrics/metrics.png differ
diff --git a/docs/application/projects/list/detail/questionnaire/comments.png b/docs/application/projects/list/detail/questionnaire/comments.png
index 9b5c8c8..b0c281e 100644
Binary files a/docs/application/projects/list/detail/questionnaire/comments.png and b/docs/application/projects/list/detail/questionnaire/comments.png differ
diff --git a/docs/application/projects/list/detail/questionnaire/item-select-question.png b/docs/application/projects/list/detail/questionnaire/item-select-question.png
index 3034a51..68de323 100644
Binary files a/docs/application/projects/list/detail/questionnaire/item-select-question.png and b/docs/application/projects/list/detail/questionnaire/item-select-question.png differ
diff --git a/docs/application/projects/list/detail/questionnaire/list-of-items-question.png b/docs/application/projects/list/detail/questionnaire/list-of-items-question.png
index 35845cc..d3447e1 100644
Binary files a/docs/application/projects/list/detail/questionnaire/list-of-items-question.png and b/docs/application/projects/list/detail/questionnaire/list-of-items-question.png differ
diff --git a/docs/application/projects/list/detail/questionnaire/options-question.png b/docs/application/projects/list/detail/questionnaire/options-question.png
index 1bd254b..6c6434f 100644
Binary files a/docs/application/projects/list/detail/questionnaire/options-question.png and b/docs/application/projects/list/detail/questionnaire/options-question.png differ
diff --git a/docs/application/projects/list/detail/questionnaire/todos.png b/docs/application/projects/list/detail/questionnaire/todos.png
index aa170b7..a1ef61d 100644
Binary files a/docs/application/projects/list/detail/questionnaire/todos.png and b/docs/application/projects/list/detail/questionnaire/todos.png differ
diff --git a/docs/application/projects/list/detail/questionnaire/version-history.png b/docs/application/projects/list/detail/questionnaire/version-history.png
index cf28d7a..c307281 100644
Binary files a/docs/application/projects/list/detail/questionnaire/version-history.png and b/docs/application/projects/list/detail/questionnaire/version-history.png differ
diff --git a/docs/application/projects/list/detail/questionnaire/warnings.png b/docs/application/projects/list/detail/questionnaire/warnings.png
index c183bba..e138c1b 100644
Binary files a/docs/application/projects/list/detail/questionnaire/warnings.png and b/docs/application/projects/list/detail/questionnaire/warnings.png differ
diff --git a/docs/application/projects/list/detail/settings/settings.png b/docs/application/projects/list/detail/settings/settings.png
index f782c65..1363b75 100644
Binary files a/docs/application/projects/list/detail/settings/settings.png and b/docs/application/projects/list/detail/settings/settings.png differ
diff --git a/docs/application/projects/list/index/project-list.png b/docs/application/projects/list/index/project-list.png
index 2d85040..dea5d53 100644
Binary files a/docs/application/projects/list/index/project-list.png and b/docs/application/projects/list/index/project-list.png differ
diff --git a/docs/application/projects/list/migration/create.png b/docs/application/projects/list/migration/create.png
index 1299d7f..a8dc7a8 100644
Binary files a/docs/application/projects/list/migration/create.png and b/docs/application/projects/list/migration/create.png differ
diff --git a/docs/application/projects/list/migration/migration.png b/docs/application/projects/list/migration/migration.png
index b3440c2..4747750 100644
Binary files a/docs/application/projects/list/migration/migration.png and b/docs/application/projects/list/migration/migration.png differ
diff --git a/docs/conf.py b/docs/conf.py
index 862956e..64221e1 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -25,7 +25,7 @@
project_name_full = 'Data Stewardship Wizard'
# The full version, including alpha/beta/rc tags
-version = release = '4.25'
+version = release = '4.26'
rst_prolog = f"""
diff --git a/docs/more/development/document-templates/document-context.svg b/docs/more/development/document-templates/document-context.svg
index 0ac377a..837dff2 100644
--- a/docs/more/development/document-templates/document-context.svg
+++ b/docs/more/development/document-templates/document-context.svg
@@ -1,8868 +1,1622 @@
-
-
+
+
+
\ No newline at end of file
diff --git a/docs/more/development/document-templates/specification.rst b/docs/more/development/document-templates/specification.rst
index 63d9154..2ad1553 100644
--- a/docs/more/development/document-templates/specification.rst
+++ b/docs/more/development/document-templates/specification.rst
@@ -93,6 +93,11 @@ Document Template Metamodel Versions
Here are described the changes in metamodel for template specification as well as :doc:`document context` so developers can easily update their templates to a newer metamodel version when needed. It is also possible to check JSON schemas in higher detail, see :doc:`../metamodel-schemas`.
+Version 17.1 (since 4.26.0)
+---------------------------
+
+* Added configurable instance properties for Document Templates, see :ref:`odc-context-config`.
+
Version 17.0 (since 4.22.0)
---------------------------
diff --git a/docs/more/miscellaneous/dsw-registry/dsw-registry.png b/docs/more/miscellaneous/dsw-registry/dsw-registry.png
index 0a459ee..4cf44f5 100644
Binary files a/docs/more/miscellaneous/dsw-registry/dsw-registry.png and b/docs/more/miscellaneous/dsw-registry/dsw-registry.png differ
diff --git a/docs/more/self-hosted-dsw/upgrade-guidelines.rst b/docs/more/self-hosted-dsw/upgrade-guidelines.rst
index 7622ee1..8d446f6 100644
--- a/docs/more/self-hosted-dsw/upgrade-guidelines.rst
+++ b/docs/more/self-hosted-dsw/upgrade-guidelines.rst
@@ -43,10 +43,17 @@ Usually, nothing special is required for the upgrade. Internal structure changes
Make sure to stop ``document-worker`` and ``mailer`` before upgrading to the next version. Run ``wizard-server`` first, then run the workers. Otherwise the database migrations might not work correctly.
+4.25.X to 4.26.X
+----------------
+
+- API Endpoints in the sections related to the Questionnaire were renamed to Project to match the DSW UI. Please check the API documentation for the new endpoints.
+- Due to changes in the API, it is necessary to rename `questionnaire-files` in S3 to `project-files`.
+- Document template metamodel version is raised (from 17.0 to 17.1) due to new type of API Integration in KM and way of versioning document template metamodel, for details check :ref:`document-template-metamodel-versions`.
+
4.24.X to 4.25.X
----------------
-- Endpoints in the sections related to the Knowledge Model and the Knowledge Model Editor have been updated. Please check the API documentation for the new endpoints.
+- API Endpoints in the sections related to the Knowledge Model and the Knowledge Model Editor have been updated. Please check the API documentation for the new endpoints.
- All Document Submissions with no Submission service defined will be deleted during migration. This can happen if the Submission service used by the Document Submission was deleted or renamed.
- It is necessary to finish all Knowledge Model migrations, either by completing or deleting them, before upgrading. The upgrade will delete any ongoing migrations.