diff --git a/code_samples/ai_actions/src/AI/Action/TranscribeAudioAction.php b/code_samples/ai_actions/src/AI/Action/TranscribeAudioAction.php
index 79e0e2ccad0..37d65143fc5 100644
--- a/code_samples/ai_actions/src/AI/Action/TranscribeAudioAction.php
+++ b/code_samples/ai_actions/src/AI/Action/TranscribeAudioAction.php
@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php 
+
+declare(strict_types=1);
 
 namespace App\AI\Action;
 
diff --git a/code_samples/ai_actions/src/AI/ActionType/TranscribeAudioActionType.php b/code_samples/ai_actions/src/AI/ActionType/TranscribeAudioActionType.php
index 34e9685dad0..b7e2a48e7db 100644
--- a/code_samples/ai_actions/src/AI/ActionType/TranscribeAudioActionType.php
+++ b/code_samples/ai_actions/src/AI/ActionType/TranscribeAudioActionType.php
@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php 
+
+declare(strict_types=1);
 
 namespace App\AI\ActionType;
 
diff --git a/code_samples/ai_actions/src/AI/DataType/Audio.php b/code_samples/ai_actions/src/AI/DataType/Audio.php
index 4323a22fa0e..180a3f5bd79 100644
--- a/code_samples/ai_actions/src/AI/DataType/Audio.php
+++ b/code_samples/ai_actions/src/AI/DataType/Audio.php
@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php 
+
+declare(strict_types=1);
 
 namespace App\AI\DataType;
 
diff --git a/code_samples/ai_actions/src/AI/Handler/LLaVaTextToTextActionHandler.php b/code_samples/ai_actions/src/AI/Handler/LLaVaTextToTextActionHandler.php
index e55dc1eaaef..fe3e4704262 100644
--- a/code_samples/ai_actions/src/AI/Handler/LLaVaTextToTextActionHandler.php
+++ b/code_samples/ai_actions/src/AI/Handler/LLaVaTextToTextActionHandler.php
@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php 
+
+declare(strict_types=1);
 
 namespace App\AI\Handler;
 
diff --git a/code_samples/ai_actions/src/AI/Handler/WhisperAudioToTextActionHandler.php b/code_samples/ai_actions/src/AI/Handler/WhisperAudioToTextActionHandler.php
index df20dd0ccfb..2f69e8db330 100644
--- a/code_samples/ai_actions/src/AI/Handler/WhisperAudioToTextActionHandler.php
+++ b/code_samples/ai_actions/src/AI/Handler/WhisperAudioToTextActionHandler.php
@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php 
+
+declare(strict_types=1);
 
 namespace App\AI\Handler;
 
@@ -47,7 +49,10 @@ public function handle(ActionInterface $action, array $context = []): ActionResp
 
         $output = $process->getOutput();
 
-        $includeTimestamps = $action->getActionContext()?->getActionTypeOptions()->get('include_timestamps', false) ?? false;
+        $includeTimestamps = $action->getActionContext()
+            ?->getActionTypeOptions()
+            ->get('include_timestamps', false) 
+            ?? false;
 
         if (!$includeTimestamps) {
             $output = $this->removeTimestamps($output);
diff --git a/code_samples/ai_actions/src/AI/REST/Input/Parser/TranscribeAudio.php b/code_samples/ai_actions/src/AI/REST/Input/Parser/TranscribeAudio.php
index e55a8d34663..0951c9b7320 100644
--- a/code_samples/ai_actions/src/AI/REST/Input/Parser/TranscribeAudio.php
+++ b/code_samples/ai_actions/src/AI/REST/Input/Parser/TranscribeAudio.php
@@ -1,6 +1,6 @@
 <?php
 
- declare(strict_types=1);
+declare(strict_types=1);
 
 namespace App\AI\REST\Input\Parser;
 
diff --git a/code_samples/ai_actions/src/AI/REST/Output/Resolver/AudioTextResolver.php b/code_samples/ai_actions/src/AI/REST/Output/Resolver/AudioTextResolver.php
index c81e8706416..3ac6ece67b7 100644
--- a/code_samples/ai_actions/src/AI/REST/Output/Resolver/AudioTextResolver.php
+++ b/code_samples/ai_actions/src/AI/REST/Output/Resolver/AudioTextResolver.php
@@ -1,6 +1,6 @@
 <?php
 
- declare(strict_types=1);
+declare(strict_types=1);
 
 namespace App\AI\REST\Output\Resolver;
 
diff --git a/code_samples/ai_actions/src/AI/REST/Output/ValueObjectVisitor/AudioText.php b/code_samples/ai_actions/src/AI/REST/Output/ValueObjectVisitor/AudioText.php
index 8d170a0b8a2..07b2240db07 100644
--- a/code_samples/ai_actions/src/AI/REST/Output/ValueObjectVisitor/AudioText.php
+++ b/code_samples/ai_actions/src/AI/REST/Output/ValueObjectVisitor/AudioText.php
@@ -1,6 +1,6 @@
 <?php
 
- declare(strict_types=1);
+declare(strict_types=1);
 
 namespace App\AI\REST\Output\ValueObjectVisitor;
 
diff --git a/code_samples/ai_actions/src/AI/REST/Value/AudioText.php b/code_samples/ai_actions/src/AI/REST/Value/AudioText.php
index de4ee04d903..d9f2cbc4175 100644
--- a/code_samples/ai_actions/src/AI/REST/Value/AudioText.php
+++ b/code_samples/ai_actions/src/AI/REST/Value/AudioText.php
@@ -1,6 +1,6 @@
 <?php
 
- declare(strict_types=1);
+declare(strict_types=1);
 
 namespace App\AI\REST\Value;
 
diff --git a/code_samples/ai_actions/src/AI/REST/Value/TranscribeAudioAction.php b/code_samples/ai_actions/src/AI/REST/Value/TranscribeAudioAction.php
index 5ed2a099fa0..643b32867e5 100644
--- a/code_samples/ai_actions/src/AI/REST/Value/TranscribeAudioAction.php
+++ b/code_samples/ai_actions/src/AI/REST/Value/TranscribeAudioAction.php
@@ -1,6 +1,6 @@
 <?php
 
- declare(strict_types=1);
+declare(strict_types=1);
 
 namespace App\AI\REST\Value;
 
diff --git a/code_samples/ai_actions/src/Command/ActionConfigurationCreateCommand.php b/code_samples/ai_actions/src/Command/ActionConfigurationCreateCommand.php
index df285f743dd..0715e57a2ef 100644
--- a/code_samples/ai_actions/src/Command/ActionConfigurationCreateCommand.php
+++ b/code_samples/ai_actions/src/Command/ActionConfigurationCreateCommand.php
@@ -1,6 +1,6 @@
 <?php
 
- declare(strict_types=1);
+declare(strict_types=1);
 
 namespace App\Command;
 
diff --git a/code_samples/ai_actions/src/Command/AddMissingAltTextCommand.php b/code_samples/ai_actions/src/Command/AddMissingAltTextCommand.php
index 315abeddb5d..0dab4e6725c 100644
--- a/code_samples/ai_actions/src/Command/AddMissingAltTextCommand.php
+++ b/code_samples/ai_actions/src/Command/AddMissingAltTextCommand.php
@@ -1,15 +1,15 @@
 <?php
 
- declare(strict_types=1);
+declare(strict_types=1);
 
 namespace App\Command;
 
-use Ibexa\AdminUi\Event\Options;
 use Ibexa\Contracts\ConnectorAi\Action\ActionContext;
 use Ibexa\Contracts\ConnectorAi\Action\DataType\Image;
 use Ibexa\Contracts\ConnectorAi\Action\DataType\Text;
 use Ibexa\Contracts\ConnectorAi\Action\GenerateAltTextAction;
 use Ibexa\Contracts\ConnectorAi\Action\RuntimeContext;
+use Ibexa\Contracts\ConnectorAi\ActionConfiguration\ActionConfigurationOptions;
 use Ibexa\Contracts\ConnectorAi\ActionServiceInterface;
 use Ibexa\Contracts\Core\Repository\ContentService;
 use Ibexa\Contracts\Core\Repository\FieldTypeService;
@@ -73,7 +73,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int
         $modifiedImages = $this->getModifiedImages();
         $output->writeln(sprintf('Found %d modified image in the last 24h', $modifiedImages->getTotalCount()));
 
-        /** @var \Ibexa\Core\Repository\Values\Content\Content $content */
+        /** @var \Ibexa\Contracts\Core\Repository\Values\Content\Content $content */
         foreach ($modifiedImages as $content) {
             /** @var ?Value $value */
             $value = $content->getFieldValue(self::IMAGE_FIELD_IDENTIFIER);
@@ -104,9 +104,9 @@ private function getSuggestedAltText(string $imageEncodedInBase64, string $langu
         $action->setRuntimeContext(new RuntimeContext(['languageCode' => $languageCode]));
         $action->setActionContext(
             new ActionContext(
-                new Options(['default_locale_fallback' => 'en']), // System context
-                new Options(['max_lenght' => 100]), // Action Type options
-                new Options( // Action Handler options
+                new ActionConfigurationOptions(['default_locale_fallback' => 'en']), // System context
+                new ActionConfigurationOptions(['max_lenght' => 100]), // Action Type options
+                new ActionConfigurationOptions( // Action Handler options
                     [
                         'prompt' => 'Generate the alt text for this image in less than 100 characters.',
                         'temperature' => 0.7,
diff --git a/code_samples/ai_actions/src/Form/Type/TextToTextOptionsType.php b/code_samples/ai_actions/src/Form/Type/TextToTextOptionsType.php
index 17cacfecded..bc2d4306d32 100644
--- a/code_samples/ai_actions/src/Form/Type/TextToTextOptionsType.php
+++ b/code_samples/ai_actions/src/Form/Type/TextToTextOptionsType.php
@@ -1,6 +1,6 @@
 <?php
 
- declare(strict_types=1);
+declare(strict_types=1);
 
 namespace App\Form\Type;
 
diff --git a/code_samples/ai_actions/src/Form/Type/TranscribeAudioOptionsType.php b/code_samples/ai_actions/src/Form/Type/TranscribeAudioOptionsType.php
index 2cb1cb9cdcc..c387716b261 100644
--- a/code_samples/ai_actions/src/Form/Type/TranscribeAudioOptionsType.php
+++ b/code_samples/ai_actions/src/Form/Type/TranscribeAudioOptionsType.php
@@ -1,6 +1,6 @@
 <?php
 
- declare(strict_types=1);
+declare(strict_types=1);
 
 namespace App\Form\Type;
 
diff --git a/code_samples/ai_actions/src/Query/Search.php b/code_samples/ai_actions/src/Query/Search.php
index 97b7410d91a..2069f838994 100644
--- a/code_samples/ai_actions/src/Query/Search.php
+++ b/code_samples/ai_actions/src/Query/Search.php
@@ -1,6 +1,6 @@
 <?php
 
- declare(strict_types=1);
+declare(strict_types=1);
 
 use Ibexa\Contracts\ConnectorAi\ActionConfiguration\ActionConfigurationQuery;
 use Ibexa\Contracts\ConnectorAi\ActionConfiguration\Query\Criterion;
diff --git a/docs/ai_actions/extend_ai_actions.md b/docs/ai_actions/extend_ai_actions.md
index aaf7cf08f13..cd6ecc87eb4 100644
--- a/docs/ai_actions/extend_ai_actions.md
+++ b/docs/ai_actions/extend_ai_actions.md
@@ -13,10 +13,10 @@ For example, you could write a handler that connects to a translation model and
 You can execute AI Actions by using the [ActionServiceInterface](../api/php_api/php_api_reference/classes/Ibexa-Contracts-ConnectorAi-ActionServiceInterface.html) service, as in the following example:
 
 ``` php
-[[= include_file('code_samples/ai_actions/src/Command/AddMissingAltTextCommand.php', 99, 118) =]]
+[[= include_file('code_samples/ai_actions/src/Command/AddMissingAltTextCommand.php', 101, 120) =]]
 ```
 
-The `GenerateAltTextAction` is a built-in action implementing the [ActionInterface](../api/php_api/php_api_reference/classes/Ibexa-Contracts-ConnectorAi-ActionInterface.html), taking an [Image](../api/php_api/php_api_reference/classes/Ibexa-Contracts-ConnectorAi-Action-DataType-Image.html) as an input.
+The `GenerateAltTextAction` is a built-in action implementing the [ActionInterface](../api/php_api/php_api_reference/classes/Ibexa-Contracts-ConnectorAi-ActionInterface.html), taking an [Image](../api/php_api/php_api_reference/classes/Ibexa-Contracts-ConnectorAi-Action-DataType-Image.html) as an input and generating the alternative text in the response.
 
 This action is parameterized using the [RuntimeContext](../api/php_api/php_api_reference/classes/Ibexa-Contracts-ConnectorAi-Action-RuntimeContext.html) and the [ActionContext](../api/php_api/php_api_reference/classes/Ibexa-Contracts-ConnectorAi-Action-ActionContext.html), allowing you to pass additional options to the Action before it's executed.
 
@@ -41,7 +41,7 @@ You can influence the execution of an Action with two events:
 
 Below you can find the full example of a Symfony Command, together with a matching service definition. The command finds the images modified in the last 24 hours, and adds the alternative text to them if it's missing.
 
-``` php hl_lines="85 98-123"
+``` php hl_lines="87 100-125"
 [[= include_file('code_samples/ai_actions/src/Command/AddMissingAltTextCommand.php') =]]
 ```
 
@@ -72,7 +72,7 @@ You can get a specific Action Configuration using the `ActionConfigurationServic
 The following example creates a new Action Configuration:
 
 ``` php hl_lines="3 17"
-[[= include_file('code_samples/ai_actions/src/Command/ActionConfigurationCreateCommand.php', 57, 74) =]]
+[[= include_file('code_samples/ai_actions/src/Command/ActionConfigurationCreateCommand.php', 59, 76) =]]
 ```
 
 Actions Configurations are tied to a specific Action Type and are translatable.
@@ -82,7 +82,7 @@ Actions Configurations are tied to a specific Action Type and are translatable.
 Reuse existing Action Configurations to simplify the execution of AI Actions. You can pass one directly to the `ActionServiceInterface::execute()` method:
 
 ``` php hl_lines="7-8"
-[[= include_file('code_samples/ai_actions/src/Command/ActionConfigurationCreateCommand.php', 75, 83) =]]
+[[= include_file('code_samples/ai_actions/src/Command/ActionConfigurationCreateCommand.php', 77, 85) =]]
 ```
 
 The passed Action Configuration is only taken into account if the Action Context was not passed to the Action directly using the [ActionInterface::setActionContext()](../api/php_api/php_api_reference/classes/Ibexa-Contracts-ConnectorAi-ActionInterface.html#method_hasActionContext) method.
@@ -108,7 +108,7 @@ Create a class implementing the [ActionHandlerInterface](../api/php_api/php_api_
 
 See the code sample below, together with a matching service definition:
 
-``` php hl_lines="19 27-30 32-67 69-72"
+``` php hl_lines="21 29-31 34-69 71-74"
 [[= include_file('code_samples/ai_actions/src/AI/Handler/LLaVaTextToTextActionHandler.php') =]]
 ```
 
@@ -128,7 +128,7 @@ The built-in Action Types use service tags to find Action Handlers capable of ha
 Form configuration makes the Handler configurable by using the back office.
 The example handler uses the `system_prompt` option, which becomes part of the Action Configuration UI thanks to the following code:
 
-``` php hl_lines="14-18"
+``` php hl_lines="16-20"
 [[= include_file('code_samples/ai_actions/src/Form/Type/TextToTextOptionsType.php') =]]
 ```
 
@@ -160,7 +160,7 @@ Start by creating your own Action Type, a class implementing the [ActionTypeInte
 - identifier
 - input type identifier
 - output type identifier
-- the Action object
+- Action object
 
 ``` php
 [[= include_file('code_samples/ai_actions/src/AI/ActionType/TranscribeAudioActionType.php') =]]
@@ -194,9 +194,9 @@ The `TranscribeAudio` Action Type requires adding two data classes that exists i
 
 ### Create custom Action Type options form
 
-Custom Form Type is needed if the Action Type requires additional options configurable in the UI. The following example adds a simple checkbox field that will indicate to the Action Handler whether the transcription should include the timestamps.
+Custom Form Type is needed if the Action Type requires additional options configurable in the UI. The following example adds a checkbox field that indicates to the Action Handler whether the transcription should include the timestamps.
 
-``` php hl_lines="14-18"
+``` php hl_lines="16-20"
 [[= include_file('code_samples/ai_actions/src/Form/Type/TranscribeAudioOptionsType.php') =]]
 ```
 
@@ -210,7 +210,7 @@ The built-in `Ibexa\Bundle\ConnectorAi\Form\FormMapper\ActionConfiguration\Actio
 
 An example Action Handler combines the input data and the Action Type options and passes them to the Whisper executable to form an Action Response. The language of the transcribed data is extracted from the Runtime Context for better results. The Action Type options provided in the Action Context dictate whether the timestamps will be removed before returning the result.
 
-``` php hl_lines="32-35 50"
+``` php hl_lines="34-37 52-55"
 [[= include_file('code_samples/ai_actions/src/AI/Handler/WhisperAudioToTextActionHandler.php') =]]
 ```
 
diff --git a/docs/ai_actions/img/transcribe_audio.png b/docs/ai_actions/img/transcribe_audio.png
index 28114ec4a12..3962a67d8b0 100644
Binary files a/docs/ai_actions/img/transcribe_audio.png and b/docs/ai_actions/img/transcribe_audio.png differ
diff --git a/docs/content_management/data_migration/importing_data.md b/docs/content_management/data_migration/importing_data.md
index cc45e5ab73a..0cc98d3c9e7 100644
--- a/docs/content_management/data_migration/importing_data.md
+++ b/docs/content_management/data_migration/importing_data.md
@@ -487,13 +487,13 @@ When updating a content type, use:
 [[= include_file('code_samples/data_migration/examples/ai/action_configuration_create.yaml') =]]
 ```
 
-- Use the `update` mode to modify an existing one:
+- Use the `update` mode to modify an existing action configuration:
 
 ``` yaml
 [[= include_file('code_samples/data_migration/examples/ai/action_configuration_update.yaml') =]]
 ```
 
-- Use the `delete` mode to delete an existing action configuration
+- Use the `delete` mode to delete an existing action configuration:
 
 ``` yaml
 [[= include_file('code_samples/data_migration/examples/ai/action_configuration_delete.yaml') =]]
diff --git a/docs/templating/twig_function_reference/ai_actions_twig_functions.md b/docs/templating/twig_function_reference/ai_actions_twig_functions.md
index eb86ef96f1d..59497ddab69 100644
--- a/docs/templating/twig_function_reference/ai_actions_twig_functions.md
+++ b/docs/templating/twig_function_reference/ai_actions_twig_functions.md
@@ -6,11 +6,11 @@ month_change: true
 
 # AI Actions Twig functions
 
-AI Actions functions allows you to embed AI Actions in your templates.
+AI Actions functions allows you to pass information about AI Actions to the Twig templates.
 
 ### `ibexa_ai_config()`
 
-The `ibexa_ai_config` function loads an Action Type with the given identifier, which you can later use in templates to invoke an AI Action.
+The `ibexa_ai_config` function loads the configuration of an Action Type with given identifier.
 
 ``` html+twig
     {% set ai_config = ibexa_ai_config('refine_text') %}